[gimp/soc-2011-gimpunitentry: 105/105] Merge branch 'origin/master' into soc-2011-gimpunitentry
- From: Martin Nordholts <martinn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2011-gimpunitentry: 105/105] Merge branch 'origin/master' into soc-2011-gimpunitentry
- Date: Mon, 29 Aug 2011 05:24:31 +0000 (UTC)
commit 036fb423433c76faafa9247df59acdeb2664a608
Merge: 844a74b 0f0bb33
Author: Martin Nordholts <martinn src gnome org>
Date: Mon Aug 29 07:22:01 2011 +0200
Merge branch 'origin/master' into soc-2011-gimpunitentry
Conflicts:
app/tools/gimprotatetool.c
AUTHORS | 1 +
INSTALL | 4 -
NEWS | 54 +
app/Makefile.am | 14 +-
app/actions/dialogs-actions.c | 40 +-
app/actions/dynamics-actions.c | 2 +-
app/actions/select-actions.c | 2 +-
app/base/tile-manager.c | 16 -
app/base/tile-manager.h | 2 -
app/config/config-enums.c | 29 +
app/config/config-enums.h | 11 +
app/config/gimpguiconfig.c | 12 +
app/config/gimpguiconfig.h | 1 +
app/config/gimprc-blurbs.h | 3 +
app/core/gimpbezierdesc.c | 13 +-
app/core/gimpdynamicsoutput.c | 6 +-
app/core/gimpgrouplayer.c | 26 +-
app/core/gimpimage-pick-layer.c | 3 +-
app/core/gimpimage.c | 28 +
app/core/gimpimage.h | 1 +
app/dialogs/about-dialog.c | 4 +-
app/dialogs/preferences-dialog.c | 5 +-
app/display/Makefile.am | 2 +
app/display/display-enums.c | 4 +
app/display/display-enums.h | 4 +-
app/display/gimpcanvasrectangleguides.c | 71 +-
app/display/gimpcanvasrectangleguides.h | 6 +-
app/display/gimpcanvastransformguides.c | 600 +
app/display/gimpcanvastransformguides.h | 67 +
app/display/gimpdisplayshell-cursor.c | 26 +-
app/display/gimpdisplayshell.c | 11 +-
app/display/gimpdisplayshell.h | 3 +-
app/display/gimpimagewindow.c | 221 +-
app/display/gimpimagewindow.h | 2 +
app/display/gimpsinglewindowstrategy.c | 64 +-
app/gegl/gimp-gegl.c | 4 +-
app/gegl/gimpoperationcagecoefcalc.c | 6 +-
app/gegl/gimpoperationcagetransform.c | 6 +-
app/gui/gimpuiconfigurer.c | 191 +-
app/gui/gui.c | 2 +-
app/paint-funcs/paint-funcs.c | 15 -
app/paint/gimppaintoptions.c | 2 +-
app/pdb/image-cmds.c | 187 +-
app/pdb/internal-procs.c | 2 +-
app/tests/.gitignore | 1 +
app/tests/Makefile.am | 1 +
app/tests/test-single-window-mode.c | 175 +
app/tools/gimpbucketfilloptions.c | 25 +-
app/tools/gimpcageoptions.c | 2 +-
app/tools/gimpdrawtool.c | 28 +-
app/tools/gimpdrawtool.h | 8 +
app/tools/gimpfliptool.c | 32 +-
app/tools/gimpgegltool.c | 19 +-
app/tools/gimpimagemaptool.c | 3 +-
app/tools/gimpmagnifyoptions.c | 4 +-
app/tools/gimpmeasureoptions.c | 2 +-
app/tools/gimppaintoptions-gui.c | 3 -
app/tools/gimpperspectivetool.c | 19 +-
app/tools/gimprectangleoptions.c | 4 +-
app/tools/gimprotatetool.c | 41 +-
app/tools/gimpscaletool.c | 29 +-
app/tools/gimpsheartool.c | 44 +-
app/tools/gimptextoptions.c | 2 +-
app/tools/gimptransformoptions.c | 163 +-
app/tools/gimptransformoptions.h | 6 +-
app/tools/gimptransformtool.c | 165 +-
app/tools/gimptransformtool.h | 10 +-
app/tools/tools-enums.c | 62 -
app/tools/tools-enums.h | 24 -
app/widgets/gimpcursor.c | 57 +-
app/widgets/gimpcursor.h | 2 +
app/widgets/gimpdialogfactory.c | 1 +
app/widgets/gimppanedbox.c | 147 +-
app/widgets/gimptoolbox-dnd.c | 10 -
app/widgets/gimptoolbox-indicator-area.c | 6 +-
app/widgets/gimptoolbox.c | 72 +-
app/widgets/gimptoolbox.h | 1 -
app/widgets/gimptoolpalette.c | 383 +-
app/widgets/gimptoolpalette.h | 6 +-
app/widgets/gimpuimanager.h | 4 +
app/widgets/gimpwidgets-utils.c | 8 +-
authors.xml | 1 +
configure.ac | 28 +-
devel-docs/Makefile.am | 1 +
devel-docs/gegl-porting-plan.txt | 39 +
docs/.gitignore | 1 -
docs/Makefile.am | 4 +-
docs/gimp-remote.1.in | 87 -
docs/gimprc.5.in | 6 +
etc/gimprc | 5 +
libgimp/gimp.def | 3 +
libgimp/gimpimage_pdb.c | 115 +-
libgimp/gimpimage_pdb.h | 3 +
libgimp/gimpselectbutton.c | 5 +-
libgimp/gimpselectbutton.h | 6 +-
libgimpwidgets/gimpcolorselection.c | 5 +-
libgimpwidgets/gimpcolorselection.h | 4 +-
libgimpwidgets/gimpcolorselector.c | 5 +-
libgimpwidgets/gimpcolorselector.h | 10 +-
libgimpwidgets/gimpfileentry.c | 5 +-
libgimpwidgets/gimpfileentry.h | 4 +-
libgimpwidgets/gimphintbox.c | 13 +-
libgimpwidgets/gimpmemsizeentry.c | 5 +-
libgimpwidgets/gimpmemsizeentry.h | 18 +-
libgimpwidgets/gimppageselector.c | 5 +-
libgimpwidgets/gimppageselector.h | 4 +-
libgimpwidgets/gimppatheditor.c | 5 +-
libgimpwidgets/gimppatheditor.h | 4 +-
libgimpwidgets/gimppreview.c | 7 +-
libgimpwidgets/gimppreview.h | 4 +-
plug-ins/common/file-gif-load.c | 25 +-
plug-ins/common/file-html-table.c | 4 +-
plug-ins/common/file-xmc.c | 8 +-
plug-ins/common/guillotine.c | 2 +
plug-ins/common/lens-apply.c | 2 +-
plug-ins/common/noise-randomize.c | 2 +-
plug-ins/common/tile-glass.c | 2 +-
plug-ins/file-bmp/bmp-write.c | 122 +-
plug-ins/file-psd/psd-load.c | 2 +-
plug-ins/file-psd/psd-util.c | 4 +
plug-ins/file-uri/uri-backend-libcurl.c | 2 +-
plug-ins/script-fu/scripts/chrome-it.scm | 2 +-
plug-ins/script-fu/scripts/line-nova.scm | 2 +-
plug-ins/twain/Makefile.am | 2 +-
po-libgimp/gl.po | 1645 ++--
po-libgimp/lv.po | 296 +-
po-libgimp/nb.po | 508 +-
po-libgimp/nn.po | 49 +-
po-libgimp/pl.po | 1720 ++--
po-libgimp/ru.po | 697 +-
po-plug-ins/LINGUAS | 1 +
po-plug-ins/en_GB.po | 5498 +++++-----
po-plug-ins/it.po | 5155 +++++-----
po-plug-ins/lv.po |12844 +++++++++++++++++++++
po-plug-ins/nn.po | 7106 ++++++------
po-plug-ins/pl.po |18118 ++++++++++++++++--------------
po-plug-ins/sl.po | 5801 +++++-----
po-python/LINGUAS | 1 +
po-python/en_GB.po | 72 +-
po-python/gl.po | 195 +-
po-python/lv.po | 343 +
po-python/nb.po | 217 +-
po-python/nn.po | 97 +-
po-python/pl.po | 281 +-
po-python/sl.po | 74 +-
po-script-fu/LINGUAS | 1 +
po-script-fu/gl.po | 807 +-
po-script-fu/lv.po | 2840 +++++
po-script-fu/nn.po | 251 +-
po-script-fu/pl.po | 913 +-
po-tags/LINGUAS | 5 +
po-tags/gl.po | 28 +
po-tags/lv.po | 28 +
po-tags/nb.po | 25 +
po-tags/pl.po | 32 +
po-tags/pt_BR.po | 28 +
po-tips/LINGUAS | 1 +
po-tips/lv.po | 307 +
po-tips/pl.po | 112 +-
po/POTFILES.in | 3 -
po/de.po | 2144 ++--
po/en_GB.po | 4537 +++++----
po/gl.po | 7585 ++++++--------
po/it.po | 3220 +++---
po/lv.po | 2785 +++--
po/nb.po | 4421 ++++----
po/nn.po |12217 +++++++--------------
po/pl.po | 6411 ++++++-----
po/ru.po | 1100 +-
po/sl.po | 2117 ++--
tools/.gitignore | 3 +-
tools/Makefile.am | 30 +-
tools/gimp-remote-x11.c | 331 -
tools/gimp-remote.c | 267 -
tools/gimp-remote.h | 37 -
tools/pdbgen/pdb/image.pdb | 1168 ++-
176 files changed, 67821 insertions(+), 50576 deletions(-)
---
diff --cc app/tools/gimprotatetool.c
index ff1cade,18b8e42..7d81e4d
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@@ -59,19 -59,21 +59,22 @@@ enu
/* local function prototypes */
- static gboolean gimp_rotate_tool_key_press (GimpTool *tool,
- GdkEventKey *kevent,
- GimpDisplay *display);
- static void gimp_rotate_tool_dialog (GimpTransformTool *tr_tool);
- static void gimp_rotate_tool_dialog_update (GimpTransformTool *tr_tool);
- static void gimp_rotate_tool_prepare (GimpTransformTool *tr_tool);
- static void gimp_rotate_tool_motion (GimpTransformTool *tr_tool);
- static void gimp_rotate_tool_recalc_matrix (GimpTransformTool *tr_tool);
- static void rotate_angle_changed (GtkAdjustment *adj,
- GimpTransformTool *tr_tool);
- static void rotate_center_changed (GObject *unit_entries,
- GtkWidget *entry,
- GimpTransformTool *tr_tool);
+ static gboolean gimp_rotate_tool_key_press (GimpTool *tool,
+ GdkEventKey *kevent,
+ GimpDisplay *display);
+
+ static void gimp_rotate_tool_dialog (GimpTransformTool *tr_tool);
+ static void gimp_rotate_tool_dialog_update (GimpTransformTool *tr_tool);
+ static void gimp_rotate_tool_prepare (GimpTransformTool *tr_tool);
+ static void gimp_rotate_tool_motion (GimpTransformTool *tr_tool);
+ static void gimp_rotate_tool_recalc_matrix (GimpTransformTool *tr_tool);
+ static gchar * gimp_rotate_tool_get_undo_desc (GimpTransformTool *tr_tool);
+
+ static void rotate_angle_changed (GtkAdjustment *adj,
+ GimpTransformTool *tr_tool);
-static void rotate_center_changed (GtkWidget *entry,
- GimpTransformTool *tr_tool);
++static void rotate_center_changed (GObject *unit_entries,
++ GtkWidget *entry,
++ GimpTransformTool *tr_tool);
G_DEFINE_TYPE (GimpRotateTool, gimp_rotate_tool, GIMP_TYPE_TRANSFORM_TOOL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
