7765 Commits

Author SHA1 Message Date
Jiří Techet
83f261fd64 filebrowser: Add a flag to the tree model to indicate whether en entry is a directory
Used by the subsequent patch which changes "stock-id" to GIcon and
disables row type detection using FILEVIEW_COLUMN_ICON.
2015-04-14 23:49:22 +02:00
Enrico Tröger
31ae06f7e5 Merge pull request #466 from techee/waf_build_tree
waf: explicitly set the location of signallist.i and geany.html in the b...
2015-04-14 20:01:45 +00:00
Jiří Techet
f6fbda768e waf: explicitly set the location of signallist.i and geany.html in the build tree
On OS X signallist.i is always rebuilt because waf looks for it in the build
tree but generates it inside the source tree for some reason so it's
always missing in the build tree. Set the target explicitly to the
build tree to fix the problem.

Similarly, set the target for geany.html to the build tree. Thanks to this
waf also creates the 'doc' directory in the build tree which is otherwise
missing and the cwd command fails for this reason (e.g. when the
_build_ directory is removed).

These two task generators are the only ones that don't use the 'features'
parameter - the features in the other task generators should already
handle the source/build tree problems for us (see the Waf Book section
6.3.3. Nodes, tasks, and task generators).
2015-04-13 23:00:43 +02:00
Colomban Wendling
d97709ff86 Merge pull request #462 from techee/waf_install
waf: Disable build/install phase interleaving
2015-04-13 17:59:54 +02:00
Colomban Wendling
ab6c145d45 Merge pull request #457 from techee/icon2
Two more Geany icon updates
2015-04-13 17:57:54 +02:00
Colomban Wendling
d14ecd68c5 Add a missing accelerator in the French translation 2015-04-13 14:11:45 +02:00
Matthew Brush
d0a431e071 Remove pre-GTK+ 2.24 preprocessor checks and related code 2015-04-12 18:05:28 -07:00
Matthew Brush
bdc082cb77 Bump min. version of GTK2 to 2.24 and GLib to 2.28
Note: This is mostly search and replace. I've only tested with my
GTK+ 2.24.20 and not at all the Waf build system.
2015-04-12 18:05:28 -07:00
Enrico Tröger
b9e090d2c8 Merge branch 'master' of github.com:geany/geany 2015-04-12 22:54:22 +02:00
Enrico Tröger
f032067443 Windows: Compile geany_private.rc into Geany.exe for version data and icon 2015-04-12 22:54:16 +02:00
Enrico Tröger
36f01551b2 Windows Installer: add geany-0.dll to the installer 2015-04-12 22:53:24 +02:00
Jiří Techet
a7ada396e2 icon: regenerate png/ico files based on the svg 2015-04-12 22:44:50 +02:00
Jiří Techet
ccfe8f23c1 waf: Disable build/install phase interleaving
When doing "./waf install" and some source files are modified
so they need to be rebuilt, the build and install phase can be
interleaved so one thread is still performing build while other
thread is already performing install tasks.

This appears to be a problem (at least on OS X) when some of
the Geany plugins are still being built and libgeany is already
being installed in parallel.

Create a separate group for the install phase to eliminate the
problem.
2015-04-12 20:57:17 +02:00
Colomban Wendling
d1a3ec1849 Small update of the French translation 2015-04-12 17:33:55 +02:00
Matthew Brush
87ee835ef2 Export scintilla_get_type() from libgeany
This is useful for plugins to be able to subclass the ScintillaObject
and use its full GObject features. The Overview plugin is one known
plugin that needs this.

Also update scintilla_changes.patch by running update-scintilla.sh
script with patch application commented-out and generating a reverse
diff using `git -R`, and manually remove `a/` and `b/` prefixes from
the resulting diff so it can be used with update-scintilla.sh script.
2015-04-11 13:35:11 -07:00
Matthew Brush
8bbe58cdf7 Fix a compiler warning about const 2015-04-10 18:52:46 -07:00
Colomban Wendling
f3078ebbc6 Merge branch 'kugel-/linkage-cleanup_rebase-for-merge'
This merges PR#429 with only small history cleanup (no code changes),
and ABI bump.

Closes #355, #358 and #429.
2015-04-10 16:54:30 +02:00
Colomban Wendling
5caf2b3e77 Bump ABI version for new linkage mechanism 2015-04-10 16:52:30 +02:00
Colomban Wendling
07dacb66d2 waf: Improve passing of export and visibility flags 2015-04-10 16:16:19 +02:00
Colomban Wendling
7ac4bf3d24 waf: Don't abuse static libraries
Instead of abusing static libraries putting shared objects in them, and
manually setting the flags required to build shared objects, use sets
of objects and Waf's own cshlib/cxxshlib flags.

Also explicitly call the appropriate build context method instead of
only listing features in order to make it clear what is built.

Some references:
* http://docs.waf.googlecode.com/git/book_16/single.html#_predefined_task_generators
* http://docs.waf.googlecode.com/git/book_16/single.html#_local_libraries
* https://code.google.com/p/waf/issues/detail?id=1398
2015-04-10 16:16:19 +02:00
Colomban Wendling
01db7f0cac Add signallist.i to gitignore 2015-04-10 16:16:19 +02:00
Colomban Wendling
5b9bb1d7b2 Include geanyplugin.h from geanyfunctions.h for compatibility
geanyfunctions.h used to bring all function declarations, and some
plugins depend on this side effect instead of properly including
geanyplugin.h directly.  So, reintroduce the behavior for
compatibility with those plugins.
2015-04-10 16:16:19 +02:00
Colomban Wendling
ede1faca54 Move GeanyFunctions declaration back in plugindata.h
This avoids breaking plugins that don't use geanyplugin.h as they
should but include some random headers.
2015-04-10 16:16:19 +02:00
Thomas Martitz
e4ab28058d waf: set rpath for executable
Whether rpath is liked or not, it allows geany to Just Work and is consistent
with autotools
2015-04-10 16:16:19 +02:00
Thomas Martitz
7649a6921f waf: Fix core plugins on Linux
The -fvisibility=hidden flag for libgeany.so is also applied to plugins.
This is not desirable.
2015-04-10 16:16:19 +02:00
Thomas Martitz
a1f2d0b94a waf: Don't use temp variables 2015-04-10 16:16:19 +02:00
Thomas Martitz
11b5c0216f stash_group_add_boolean is an API function, misplaced within GEANY_PRIVATE 2015-04-10 16:16:19 +02:00
Thomas Martitz
1c27e41bfa The mkstemps special case for windows is not necessary 2015-04-10 16:16:19 +02:00
Thomas Martitz
a320609d5f waf: Fixes for libgeany
- libgeany install dir was wrong on win32
- comdlg32 is required
- more headers need to be installed
- -fPIC is required on some platforms
- LINKFLAGS_cprogram now have to be applied to libgeany.dll
2015-04-10 16:16:19 +02:00
Thomas Martitz
05f362b3bd Have to include a few more headers for plugins 2015-04-10 16:16:19 +02:00
Colomban Wendling
b2ba6c84d5 autotools: Cleanup makefile a little 2015-04-10 16:16:19 +02:00
Colomban Wendling
4e02f58847 autotools: Remove useless declaration
There is no need for tricking Automake to use the C++ linker to link
the main executable anymore, this is done for libgeany now.
2015-04-10 16:16:19 +02:00
Colomban Wendling
e61948adbd Fix or remove incorrect comments 2015-04-10 16:16:19 +02:00
Colomban Wendling
90b5e9b76f waf: Add rule to generate signallist.i
Based on previous work from Matthew Brush.
2015-04-10 16:16:19 +02:00
Thomas Martitz
dbe910ca5e GEANY_API_SYMBOL for project_write_config() 2015-04-10 16:16:18 +02:00
Colomban Wendling
56b9189a6c Fix generation of signallist.i with BSD sed
4.2BSD sed doesn't understand the `+` quantifier, so use `{1,}`.
2015-04-10 16:16:18 +02:00
Colomban Wendling
c85b846eeb Simplify automated signal connection
Instead of processing a template C source in the build system, generate
a list to be included by the preprocessor.

This simplifies the build system code as it now only generates the list
and doesn't take care of processing the template.  It incidentally
fixes build on systems with 4.2BSD sed (at least OSX and FreeBSD) as it
removes some offending sed code.
2015-04-10 16:16:18 +02:00
Thomas Martitz
11d4bcf7c2 Only use LIBGEANY_CFLAGS on libgeany.
It includes stuff like -fvisibility which isn't appropriate for the main binary.
2015-04-10 16:16:18 +02:00
Enrico Tröger
43037b379b waf: Implement check whether compiler supports -fvisibility=hidden
This is a bit better than compiler == 'gcc'.
Tested with gcc 4.9 (success) and gcc 3.4.5 (not supported).
2015-04-10 16:16:05 +02:00
Enrico Tröger
3d0bdbd6da waf: The GEANY_*_SYMBOL flags also need to be defined for C++
In Waf, we need to add the new flags to CFLAGS *and* CXXFLAGS otherwise
the Scintilla build would break.
To keep it more reabable, we first populate a temporary list
geany_symbol_flags which is then added to CFLAGS and CXXFLAGS.

Concerning the quote FIXME: no further qoting is necessary here.
2015-04-10 16:15:58 +02:00
Enrico Tröger
abc5f3239b waf: Adjust to build and use libgeany 2015-04-10 16:15:45 +02:00
Thomas Martitz
616cbe3da9 src: Makefile.am cleanup 2015-04-10 16:08:08 +02:00
Colomban Wendling
9eee68b71d Fix exporting Scintilla symbols 2015-04-10 16:08:08 +02:00
Colomban Wendling
9644fb0ae2 Define GEANY_{EXPORT,API}_SYMBOL from the build system
This makes it easier to define it consistently to what the compiler
and platform supports, and avoids having to include a special header
everywhere, which is some kind of a problem for separate libraries
like TagManager and especially Scintilla.

As we only use these macros from the source and not the headers, it
is fine for it to be defined to a configure-time check from the build
system.

Warning: Although Waf and Windows makefiles are updated they are not
         tested an will probably required tuning.
2015-04-10 16:08:08 +02:00
Colomban Wendling
4e6da78f54 PHP: Use the variable style for variable interpolated in strings
Use the same variable style for simple interpolations ("$foo") than for
complex ones ("${foo}") instead of using the string style itself.  This
gives a visual feedback for simple interpolations.
2015-04-10 00:24:20 +02:00
Colomban Wendling
1bed458ab9 Merge pull request #270 from b4n/zephir-filetype
Zephir filetype
2015-04-09 01:06:57 +02:00
Jiří Techet
5cf2511945 icon: Adjust the color of the inside of the bottleneck
The (almost) black color of the inside of the bottleneck is a bit too high
contrast and doesn't fit the rest of the icon (the only black part of it).
Use the "lamp yellow" as the base and lower the L in HSL representation of
the color so it just looks as darker lamp material.
2015-04-06 20:59:20 +02:00
Jiří Techet
cbd13b8f71 icon: Adjust the left-bottom curve of the bottleneck
After making the bottleneck wider (by shifting the curve to the left), the
curve became flatter which looks strange. Make the curve a bit more round
in the middle.
2015-04-06 20:59:08 +02:00
Colomban Wendling
11e16eed6f Remove an unused argument 2015-04-02 19:12:13 +02:00
Frank Lanitz
d4f707bb78 Small update of German translation 2015-03-31 07:10:31 +02:00