mirror of https://github.com/GNOME/gimp.git
Merge commit 'origin/master' into soc-2009-dynamics
This commit is contained in:
Alexia Death
commit
4e018eaa18
|
|
@ -6,3 +6,4 @@
|
|||
/gimp-2.*
|
||||
/gimp-console-2.*
|
||||
/libapp.a
|
||||
/gimp.rc
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
|
|||
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
|
||||
|
||||
|
||||
# Sort this by architectural depenendencies, lowest level at the top,
|
||||
# Sort this by architectural dependencies, lowest level at the top,
|
||||
# so that when e.g. changing a header-file the subdirs are built in
|
||||
# the right order
|
||||
SUBDIRS = \
|
||||
|
|
@ -90,7 +90,8 @@ munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
|
|||
endif
|
||||
|
||||
if HAVE_WINDRES
|
||||
GIMPICONRC = gimprc.o
|
||||
GIMPRC = gimp.rc.o
|
||||
GIMPCONSOLERC = gimp-console.rc.o
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
@ -164,7 +165,6 @@ gimpconsoleldadd = \
|
|||
$(libgimpcolor) \
|
||||
$(libgimpmodule) \
|
||||
$(libgimpbase) \
|
||||
$(GIMPICONRC) \
|
||||
$(GDK_PIXBUF_LIBS) \
|
||||
$(FREETYPE_LIBS) \
|
||||
$(FONTCONFIG_LIBS) \
|
||||
|
|
@ -188,7 +188,8 @@ gimp_2_7_LDADD = \
|
|||
$(libgimpwidgets) \
|
||||
$(GTK_LIBS) \
|
||||
$(DBUS_GLIB_LIBS) \
|
||||
$(gimpconsoleldadd)
|
||||
$(gimpconsoleldadd) \
|
||||
$(GIMPRC)
|
||||
|
||||
|
||||
if ENABLE_GIMP_CONSOLE
|
||||
|
|
@ -200,7 +201,8 @@ gimp_console_2_7_CPPFLAGS = \
|
|||
-DGIMP_CONSOLE_COMPILATION
|
||||
|
||||
gimp_console_2_7_LDADD = \
|
||||
$(gimpconsoleldadd)
|
||||
$(gimpconsoleldadd) \
|
||||
$(GIMPCONSOLERC)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -256,5 +258,12 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
|
|||
|
||||
dist-hook: dist-check-gimp-console dist-dump-gimprc
|
||||
|
||||
gimprc.o: gimp.rc
|
||||
$(WINDRES) gimp.rc gimprc.o
|
||||
gimp.rc.o: gimp.rc
|
||||
$(WINDRES) --define ORIGINALFILENAME_STR="gimp-2.7$(EXEEXT)" \
|
||||
--define INTERNALNAME_STR="gimp-2.7" \
|
||||
gimp.rc gimp.rc.o
|
||||
|
||||
gimp-console.rc.o: gimp.rc
|
||||
$(WINDRES) --define ORIGINALFILENAME_STR="gimp-console-2.7$(EXEEXT)" \
|
||||
--define INTERNALNAME_STR="gimp-console-2.7" \
|
||||
gimp.rc gimp-console.rc.o
|
||||
|
|
|
|||
|
|
@ -1,2 +1,65 @@
|
|||
#include <winver.h>
|
||||
|
||||
#define _QUOTE(x) #x
|
||||
#define QUOTE(x) _QUOTE(x)
|
||||
|
||||
#define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team"
|
||||
|
||||
#define VER_PRODUCTVERSION @GIMP_MAJOR_VERSION@,@GIMP_MINOR_VERSION@,@GIMP_MICRO_VERSION@,0
|
||||
#define VER_PRODUCTVERSION_STR "@GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@\0"
|
||||
#define VER_PRODUCTNAME_STR "@GIMP_FULL_NAME@"
|
||||
|
||||
#define VER_FILEVERSION @GIMP_MAJOR_VERSION@,@GIMP_MINOR_VERSION@,@GIMP_MICRO_VERSION@,0
|
||||
#define VER_FILEVERSION_STR "@GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@.0\0"
|
||||
|
||||
#define VER_FILEDESCRIPTION_STR "@GIMP_FULL_NAME@"
|
||||
#define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR)
|
||||
#define VER_ORIGINALFILENAME_STR QUOTE(ORIGINALFILENAME_STR)
|
||||
|
||||
#define VER_LEGALCOPYRIGHT_STR "Copyright © 1995-2009"
|
||||
|
||||
#ifndef DEBUG
|
||||
#define VER_DEBUG 0
|
||||
#else
|
||||
#define VER_DEBUG VS_FF_DEBUG
|
||||
#endif
|
||||
|
||||
#ifndef GIMP_UNSTABLE
|
||||
#define VER_PRERELEASE 0
|
||||
#else
|
||||
#define VER_PRERELEASE VS_FF_PRERELEASE
|
||||
#endif
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION VER_FILEVERSION
|
||||
PRODUCTVERSION VER_PRODUCTVERSION
|
||||
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
||||
FILEFLAGS (VER_PRERELEASE|VER_DEBUG)
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_APP
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", VER_COMPANYNAME_STR
|
||||
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", VER_INTERNALNAME_STR
|
||||
VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
|
||||
VALUE "ProductName", VER_PRODUCTNAME_STR
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
|
||||
END
|
||||
END
|
||||
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
|
||||
END
|
||||
END
|
||||
|
||||
1 ICON "wilber.ico"
|
||||
2 ICON "fileicon.ico"
|
||||
|
|
|
|||
|
|
@ -1431,9 +1431,22 @@ gimp_text_tool_move_cursor (GimpTextTool *text_tool,
|
|||
gtk_text_buffer_get_selection_bound (buffer));
|
||||
|
||||
if (extend_selection)
|
||||
sel_start = &selection;
|
||||
{
|
||||
sel_start = &selection;
|
||||
}
|
||||
else
|
||||
sel_start = &cursor;
|
||||
{
|
||||
/* when there is a selection, moving the cursor without
|
||||
* extending it should move the cursor to the end of the
|
||||
* selection that is in moving direction
|
||||
*/
|
||||
if (count > 0)
|
||||
gtk_text_iter_order (&selection, &cursor);
|
||||
else
|
||||
gtk_text_iter_order (&cursor, &selection);
|
||||
|
||||
sel_start = &cursor;
|
||||
}
|
||||
|
||||
switch (step)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue