Merge remote-tracking branch 'origin/master' into tm/tree-refactoring
This commit is contained in:
Nick Treleaven
commit
9f99b4f55a
2
NEWS
2
NEWS
@ -21,6 +21,7 @@ Geany 1.22 (unreleased)
|
||||
* Fix very slow regex tag parsing on Windows (e.g. for HTML).
|
||||
* Fix detecting a changed file on disk when opening from
|
||||
the command-line (Windows).
|
||||
* Fix quick search entry behavior on Windows.
|
||||
* Add missing Windows mio makefile.
|
||||
|
||||
Prefs
|
||||
@ -31,6 +32,7 @@ Geany 1.22 (unreleased)
|
||||
Interface
|
||||
* Add support for switching to the last used document after closing
|
||||
a tab (Jiří Techet).
|
||||
* Improve the tab switching dialog for better usability (Jiří Techet).
|
||||
* Add support for user-defined labels for 'Send Selection to'
|
||||
custom commands.
|
||||
* Fix sidebar width when on the right (#3514436).
|
||||
|
||||
@ -13,7 +13,7 @@ error=0xffffff;0xff0000
|
||||
# Editor styles
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
selection=0x000000;0xc0c0c0;false;false
|
||||
selection=0x000000;0xc0c0c0;false;true
|
||||
current_line=0x000000;0xf0f0f0;true
|
||||
brace_good=0x0000ff;0xFFFFFF;true;false
|
||||
brace_bad=0xff0000;0xFFFFFF;true;false
|
||||
|
||||
@ -103,7 +103,7 @@ whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~
|
||||
default=0x000000;0xffffff;false;false
|
||||
error=0xff0000;0xBFBFBF;false;italic
|
||||
|
||||
selection=0x000000;0xc0c0c0;false;false
|
||||
selection=0x000000;0xc0c0c0;false;true
|
||||
current_line=0x000000;0xf0f0f0;true;
|
||||
brace_good=0x0000ff;0xFFFFFF;true;false
|
||||
brace_bad=0xff0000;0xFFFFFF;true;false
|
||||
|
||||
@ -997,7 +997,7 @@
|
||||
<object class="GtkEntry" id="startup_path_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory.</property>
|
||||
<property name="tooltip_text" translatable="yes">Path to start in when opening or saving files. Must be an absolute path.</property>
|
||||
<property name="invisible_char">•</property>
|
||||
<property name="primary_icon_activatable">False</property>
|
||||
<property name="secondary_icon_activatable">False</property>
|
||||
|
||||
@ -2159,8 +2159,7 @@ you open Geany it's in the same location.</dd>
|
||||
<dl class="docutils">
|
||||
<dt>Startup path</dt>
|
||||
<dd>Path to start in when opening or saving files.
|
||||
It must be an absolute path.
|
||||
Leave it blank to use the current working directory.</dd>
|
||||
It must be an absolute path.</dd>
|
||||
<dt>Project files</dt>
|
||||
<dd>Path to start in when opening project files.</dd>
|
||||
<dt>Extra plugin path</dt>
|
||||
@ -5982,17 +5981,29 @@ copied into the configured backup directory when the file is saved in Geany.</p>
|
||||
<p>This document (<tt class="docutils literal">geany.txt</tt>) is written in <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>
|
||||
(or "reST"). The source file for it is located in Geany's <tt class="docutils literal">doc</tt>
|
||||
subdirectory. If you intend on making changes, you should grab the
|
||||
source right from SVN to make sure you've got the newest version. After
|
||||
source right from Git to make sure you've got the newest version. After
|
||||
editing the file, to build the HTML document to see how your changes
|
||||
look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source
|
||||
directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF
|
||||
file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called
|
||||
geany-1.22.pdf.</p>
|
||||
<p>After you are happy with your changes, create a patch:</p>
|
||||
<p>After you are happy with your changes, create a patch e.g. by using:</p>
|
||||
<pre class="literal-block">
|
||||
% svn diff geany.txt > foo.patch
|
||||
% git diff geany.txt > foo.patch
|
||||
</pre>
|
||||
<p>or even better, by creating a Git-formatted patch which will keep authoring
|
||||
and description data, by first committing your changes (doing so in a fresh
|
||||
new branch is recommended for <cite>matser</cite> not to diverge from upstream) and then
|
||||
using git format-patch:</p>
|
||||
<pre class="literal-block">
|
||||
% git checkout -b my-documentation-changes # create a fresh branch
|
||||
% git commit geany.txt
|
||||
Write a good commit message...
|
||||
% git format-patch HEAD^
|
||||
% git checkout master # go back to master
|
||||
</pre>
|
||||
<p>and then submit that file to the mailing list for review.</p>
|
||||
<p>Also you can clone the Geany repository at GitHub and send a pull request.</p>
|
||||
<p>Note, you will need the Python docutils software package installed
|
||||
to build the docs. The package is named <tt class="docutils literal"><span class="pre">python-docutils</span></tt> on Debian
|
||||
and Fedora systems.</p>
|
||||
@ -6776,7 +6787,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
|
||||
<div class="footer">
|
||||
<hr class="footer" />
|
||||
<a class="reference external" href="geany.txt">View document source</a>.
|
||||
Generated on: 2012-04-25 14:39 UTC.
|
||||
Generated on: 2012-06-04 21:07 UTC.
|
||||
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
|
||||
|
||||
</div>
|
||||
|
||||
@ -1763,7 +1763,6 @@ Paths
|
||||
Startup path
|
||||
Path to start in when opening or saving files.
|
||||
It must be an absolute path.
|
||||
Leave it blank to use the current working directory.
|
||||
|
||||
Project files
|
||||
Path to start in when opening project files.
|
||||
@ -4985,7 +4984,7 @@ Contributing to this document
|
||||
This document (``geany.txt``) is written in `reStructuredText`__
|
||||
(or "reST"). The source file for it is located in Geany's ``doc``
|
||||
subdirectory. If you intend on making changes, you should grab the
|
||||
source right from SVN to make sure you've got the newest version. After
|
||||
source right from Git to make sure you've got the newest version. After
|
||||
editing the file, to build the HTML document to see how your changes
|
||||
look, run "``make doc``" in the subdirectory ``doc`` of Geany's source
|
||||
directory. This regenerates the ``geany.html`` file. To generate a PDF
|
||||
@ -4994,12 +4993,25 @@ geany-|(version)|.pdf.
|
||||
|
||||
__ http://docutils.sourceforge.net/rst.html
|
||||
|
||||
After you are happy with your changes, create a patch::
|
||||
After you are happy with your changes, create a patch e.g. by using::
|
||||
|
||||
% svn diff geany.txt > foo.patch
|
||||
% git diff geany.txt > foo.patch
|
||||
|
||||
or even better, by creating a Git-formatted patch which will keep authoring
|
||||
and description data, by first committing your changes (doing so in a fresh
|
||||
new branch is recommended for `matser` not to diverge from upstream) and then
|
||||
using git format-patch::
|
||||
|
||||
% git checkout -b my-documentation-changes # create a fresh branch
|
||||
% git commit geany.txt
|
||||
Write a good commit message...
|
||||
% git format-patch HEAD^
|
||||
% git checkout master # go back to master
|
||||
|
||||
and then submit that file to the mailing list for review.
|
||||
|
||||
Also you can clone the Geany repository at GitHub and send a pull request.
|
||||
|
||||
Note, you will need the Python docutils software package installed
|
||||
to build the docs. The package is named ``python-docutils`` on Debian
|
||||
and Fedora systems.
|
||||
|
||||
@ -84,41 +84,41 @@
|
||||
*
|
||||
* @subsection code Managing the source code
|
||||
*
|
||||
* For authors of plugins for Geany, we created a dedicated @a geany-plugins project at
|
||||
* Sourceforge to ease development of plugins and help new authors.
|
||||
* Project website: http://sourceforge.net/projects/geany-plugins
|
||||
* For authors of plugins for Geany, we created a dedicated @a geany-plugins project
|
||||
* on Sourceforge and GitHub to ease development of plugins and help new authors.
|
||||
* All information about this project you can find at http://plugins.geany.org/
|
||||
*
|
||||
* Each plugin author is welcome to use these services. To do so, you need an account at
|
||||
* Sourceforge. You can easily register at (http://sourceforge.net/account/registration/).
|
||||
* After you successfully created an account,
|
||||
* tell your account name Enrico or Nick and you will write access to the SVN repository
|
||||
* (http://geany-plugins.svn.sourceforge.net/viewvc/geany-plugins/).
|
||||
* Then you can use the repository for your own plugin.
|
||||
* To add a new plugin to this project, get in touch with the people on the
|
||||
* geany-devel-mailing list and create a fork of the geany-plugins project
|
||||
* at https://github.com/geany/geany-plugins.
|
||||
* Beside of adding a new plugin, geany-devel-mailing list is also the place where
|
||||
* to discuss development related questions.
|
||||
* However, once you have done your fork of geany-plugins you can develop
|
||||
* your plugin until you think its the right time to publish it. At this point,
|
||||
* create a pull request for adding your patch set into the master branch of the main
|
||||
* geany-plugins repository.
|
||||
*
|
||||
* Authors using this service should subscribe to the
|
||||
* geany-plugins-commits at uvena.de and geany-plugins-tracker at uvena.de
|
||||
* mailing lists(see my previous post) to stay up to date with changes.
|
||||
* General plugin discussion can happen on the normal geany at uvena.de or
|
||||
* geany-devel at uvena.de lists.
|
||||
* Of course, you don't need to use GitHub - any Git is fine. But GitHub
|
||||
* is making it way easier for review, merging and get in touch with you for
|
||||
* comments.
|
||||
*
|
||||
* If you don't want your plugin to be part of the geany-plugins project it is also fine.
|
||||
* Just skip the part about forking geany-plugins and sending a pull request.
|
||||
* In this case it is of course also a good idea to post some kind of announcement
|
||||
* to geany-devel and maybe to the main geany mailing list -- it's up to you.
|
||||
* You can also ask for your plugin to be listed on the http://plugins.geany.org/
|
||||
* website as a third party plugin, helping Geany user to know about your plugin.
|
||||
*
|
||||
* At time of writing, there are some plugins already available in the
|
||||
* repository. Feel free to use any of these plugins as a start for your own,
|
||||
* repositories. Feel free to use any of these plugins as a start for your own,
|
||||
* maybe by copying the directory structure and the autotools files
|
||||
* (Makefile.am, configure.in, ...). Most of the available plugins are also ready for
|
||||
* i18n support, just for reference.
|
||||
*
|
||||
* New plugins should be imported into a new directory inside the trunk/
|
||||
* directory. There are also the common branches and tags directories, use
|
||||
* them as needed, use always a subdirectory for your own plugin.
|
||||
*
|
||||
* We encourage authors using this service to only commit changes to their
|
||||
* own plugin and not to others' plugins. Instead just send patches to
|
||||
* geany-devel at uvena.de or the plugin author directly.
|
||||
*
|
||||
* (the full announcement of this service can be found at
|
||||
* http://lists.uvena.de/geany/2008-April/003225.html)
|
||||
*
|
||||
*
|
||||
* @section paths Installation paths
|
||||
*
|
||||
* - The plugin binary (@c pluginname.so) should be installed in Geany's libdir. This is
|
||||
|
||||
87
po/de.po
87
po/de.po
@ -9,15 +9,15 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: geany 1.22\n"
|
||||
"Project-Id-Version: Geany 1.22\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-05-28 13:53+0200\n"
|
||||
"POT-Creation-Date: 2012-06-03 17:50+0200\n"
|
||||
"PO-Revision-Date: 2012-03-05 19:20+0100\n"
|
||||
"Last-Translator: Frank Lanitz <frank@frank.uvena.de>\n"
|
||||
"Language-Team: German <geany-i18n@uvena.de>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=utf-8\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Poedit-Country: GERMANY\n"
|
||||
@ -2160,6 +2160,17 @@ msgstr "Meldungen"
|
||||
msgid "Scribble"
|
||||
msgstr "Notizen"
|
||||
|
||||
#: ../src/about.c:41
|
||||
msgid ""
|
||||
"Copyright (c) 2005-2012\n"
|
||||
"Colomban Wendling\n"
|
||||
"Nick Treleaven\n"
|
||||
"Matthew Brush\n"
|
||||
"Enrico Tröger\n"
|
||||
"Frank Lanitz\n"
|
||||
"All rights reserved."
|
||||
msgstr ""
|
||||
|
||||
#: ../src/about.c:157
|
||||
msgid "About Geany"
|
||||
msgstr "Über Geany"
|
||||
@ -2218,11 +2229,11 @@ msgstr ""
|
||||
msgid "Credits"
|
||||
msgstr "Credits"
|
||||
|
||||
#: ../src/about.c:414
|
||||
#: ../src/about.c:417
|
||||
msgid "License"
|
||||
msgstr "Lizenz"
|
||||
|
||||
#: ../src/about.c:423
|
||||
#: ../src/about.c:426
|
||||
msgid ""
|
||||
"License text could not be found, please visit http://www.gnu.org/licenses/"
|
||||
"gpl-2.0.txt to view it online."
|
||||
@ -2677,7 +2688,7 @@ msgstr ""
|
||||
|
||||
#: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225
|
||||
#: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233
|
||||
#: ../src/symbols.c:2096 ../src/symbols.c:2117 ../src/symbols.c:2169
|
||||
#: ../src/symbols.c:2094 ../src/symbols.c:2115 ../src/symbols.c:2167
|
||||
#: ../src/ui_utils.c:264
|
||||
msgid "unknown"
|
||||
msgstr "unbekannt"
|
||||
@ -3176,17 +3187,26 @@ msgstr "Schlechter RegEx für Dateityp %s: %s"
|
||||
msgid "untitled"
|
||||
msgstr "unbenannt"
|
||||
|
||||
#: ../src/highlighting.c:1215 ../src/main.c:821 ../src/socket.c:166
|
||||
#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166
|
||||
#: ../src/templates.c:224
|
||||
#, c-format
|
||||
msgid "Could not find file '%s'."
|
||||
msgstr "Konnte die Datei »%s« nicht finden."
|
||||
|
||||
#: ../src/highlighting.c:1287
|
||||
#: ../src/highlighting.c:1297
|
||||
msgid "Default"
|
||||
msgstr "Standard"
|
||||
|
||||
#: ../src/highlighting.c:1341
|
||||
#: ../src/highlighting.c:1336
|
||||
#, fuzzy
|
||||
msgid "The current filetype overrides the default style."
|
||||
msgstr "Kompiliert die aktuelle Datei mit »make« und dem Standard-Target"
|
||||
|
||||
#: ../src/highlighting.c:1337
|
||||
msgid "This may cause color schemes to display incorrectly."
|
||||
msgstr ""
|
||||
|
||||
#: ../src/highlighting.c:1358
|
||||
msgid "Color Schemes"
|
||||
msgstr "Farbschemata"
|
||||
|
||||
@ -3711,11 +3731,11 @@ msgstr ""
|
||||
"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen "
|
||||
"werden."
|
||||
|
||||
#: ../src/log.c:180
|
||||
#: ../src/log.c:181
|
||||
msgid "Debug Messages"
|
||||
msgstr "Debug-Meldungen"
|
||||
|
||||
#: ../src/log.c:182
|
||||
#: ../src/log.c:183
|
||||
msgid "Cl_ear"
|
||||
msgstr "_Leeren"
|
||||
|
||||
@ -3813,22 +3833,22 @@ msgid "[FILES...]"
|
||||
msgstr "[Dateien...]"
|
||||
|
||||
#. note for translators: library versions are printed after this
|
||||
#: ../src/main.c:540
|
||||
#: ../src/main.c:547
|
||||
#, c-format
|
||||
msgid "built on %s with "
|
||||
msgstr "kompiliert am %s mit "
|
||||
|
||||
#: ../src/main.c:628
|
||||
#: ../src/main.c:635
|
||||
msgid "Move it now?"
|
||||
msgstr "Soll es jetzt verschoben werden?"
|
||||
|
||||
#: ../src/main.c:630
|
||||
#: ../src/main.c:637
|
||||
msgid "Geany needs to move your old configuration directory before starting."
|
||||
msgstr ""
|
||||
"Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort "
|
||||
"verschieben, bevor es gestartet wird."
|
||||
|
||||
#: ../src/main.c:639
|
||||
#: ../src/main.c:646
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your configuration directory has been successfully moved from \"%s\" to \"%s"
|
||||
@ -3839,7 +3859,7 @@ msgstr ""
|
||||
|
||||
#. for translators: the third %s in brackets is the error message which
|
||||
#. * describes why moving the dir didn't work
|
||||
#: ../src/main.c:649
|
||||
#: ../src/main.c:656
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). "
|
||||
@ -3848,7 +3868,7 @@ msgstr ""
|
||||
"Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben "
|
||||
"werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus."
|
||||
|
||||
#: ../src/main.c:730
|
||||
#: ../src/main.c:737
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Configuration directory could not be created (%s).\n"
|
||||
@ -3859,17 +3879,17 @@ msgstr ""
|
||||
"Es könnte zu Problemen bei der Verwendung von Geany kommen.\n"
|
||||
"Geany trotzdem starten?"
|
||||
|
||||
#: ../src/main.c:1067
|
||||
#: ../src/main.c:1074
|
||||
#, c-format
|
||||
msgid "This is Geany %s."
|
||||
msgstr "Willkommen zu Geany %s."
|
||||
|
||||
#: ../src/main.c:1069
|
||||
#: ../src/main.c:1076
|
||||
#, c-format
|
||||
msgid "Configuration directory could not be created (%s)."
|
||||
msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)."
|
||||
|
||||
#: ../src/main.c:1286
|
||||
#: ../src/main.c:1293
|
||||
msgid "Configuration files reloaded."
|
||||
msgstr "Einstellungen erneut geladen."
|
||||
|
||||
@ -3967,11 +3987,11 @@ msgstr "Tasten festlegen"
|
||||
msgid "Press the combination of the keys you want to use for \"%s\"."
|
||||
msgstr "Welche Tastenkombination soll für »%s« genutzt werden?"
|
||||
|
||||
#: ../src/prefs.c:226 ../src/symbols.c:2238 ../src/sidebar.c:730
|
||||
#: ../src/prefs.c:226 ../src/symbols.c:2236 ../src/sidebar.c:730
|
||||
msgid "_Expand All"
|
||||
msgstr "Alle a_usklappen"
|
||||
|
||||
#: ../src/prefs.c:231 ../src/symbols.c:2243 ../src/sidebar.c:736
|
||||
#: ../src/prefs.c:231 ../src/symbols.c:2241 ../src/sidebar.c:736
|
||||
msgid "_Collapse All"
|
||||
msgstr "Alle _einklappen"
|
||||
|
||||
@ -4763,21 +4783,21 @@ msgstr "%s Tag-Datei »%s« geladen."
|
||||
msgid "Could not load tags file '%s'."
|
||||
msgstr "Konnte Tag-Datei »%s« nicht laden."
|
||||
|
||||
#: ../src/symbols.c:1945
|
||||
#: ../src/symbols.c:1943
|
||||
#, c-format
|
||||
msgid "Forward declaration \"%s\" not found."
|
||||
msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden."
|
||||
|
||||
#: ../src/symbols.c:1947
|
||||
#: ../src/symbols.c:1945
|
||||
#, c-format
|
||||
msgid "Definition of \"%s\" not found."
|
||||
msgstr "Definition von »%s« nicht gefunden."
|
||||
|
||||
#: ../src/symbols.c:2253
|
||||
#: ../src/symbols.c:2251
|
||||
msgid "Sort by _Name"
|
||||
msgstr "Nach _Namen sortieren"
|
||||
|
||||
#: ../src/symbols.c:2260
|
||||
#: ../src/symbols.c:2258
|
||||
msgid "Sort by _Appearance"
|
||||
msgstr "Nach _Auftreten sortieren"
|
||||
|
||||
@ -5088,6 +5108,16 @@ msgstr "T/L"
|
||||
msgid "MOD"
|
||||
msgstr "MOD"
|
||||
|
||||
#: ../src/ui_utils.c:328
|
||||
#, c-format
|
||||
msgid "pos: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/ui_utils.c:330
|
||||
#, fuzzy, c-format
|
||||
msgid "style: %d"
|
||||
msgstr "Symbolstil:"
|
||||
|
||||
#: ../src/ui_utils.c:382
|
||||
msgid " (new instance)"
|
||||
msgstr " (neue Instanz)"
|
||||
@ -5137,7 +5167,7 @@ msgstr "Alle speichern"
|
||||
msgid "Close All"
|
||||
msgstr "Alle schließen"
|
||||
|
||||
#: ../src/ui_utils.c:2230
|
||||
#: ../src/ui_utils.c:2225
|
||||
msgid "Geany cannot start!"
|
||||
msgstr "Geany kann nicht starten!"
|
||||
|
||||
@ -5864,9 +5894,6 @@ msgstr "Vertikal teilen"
|
||||
#~ msgid "_Customize Toolbar"
|
||||
#~ msgstr "_Werkzeugleiste anpassen"
|
||||
|
||||
#~ msgid "Icon style:"
|
||||
#~ msgstr "Symbolstil:"
|
||||
|
||||
#~ msgid "Icon size:"
|
||||
#~ msgstr "Symbolgröße:"
|
||||
|
||||
|
||||
6515
po/en_GB.po
6515
po/en_GB.po
File diff suppressed because it is too large
Load Diff
6553
po/pt_BR.po
6553
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
5891
po/zh_CN.po
5891
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
6733
po/zh_TW.po
6733
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
@ -8,8 +8,8 @@
|
||||
# To force GTK+ 1 build, define GTK1 on the make command line.
|
||||
|
||||
.SUFFIXES: .cxx .c .o .h .a
|
||||
CC = g++
|
||||
CCOMP = gcc
|
||||
CXX = g++
|
||||
CC = gcc
|
||||
AR = ar
|
||||
RANLIB = ranlib
|
||||
PREFIX = C:\libs
|
||||
@ -55,9 +55,9 @@ CONFIGFLAGS=$(GTK_INCLUDES)
|
||||
MARSHALLER=scintilla-marshal.o
|
||||
|
||||
.cxx.o:
|
||||
$(CC) $(CXXFLAGS) -c $<
|
||||
$(CXX) $(CXXFLAGS) -c $<
|
||||
.c.o:
|
||||
$(CCOMP) $(CXXFLAGS) -w -c $<
|
||||
$(CC) $(CXXFLAGS) -c $<
|
||||
|
||||
LEXOBJS=\
|
||||
LexAda.o \
|
||||
@ -139,7 +139,7 @@ $(COMPLIB): $(MARSHALLER) $(LEXOBJS) $(SRCOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
deps.mak:
|
||||
$(CC) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
|
||||
$(CXX) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
|
||||
|
||||
# Generate header dependencies with "make deps.mak"
|
||||
include deps.mak
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
FILES=$*
|
||||
if [ -n "$FILES" ]; then
|
||||
svn add $FILES
|
||||
svn propset svn:keywords 'Author Date Id Revision' $FILES
|
||||
svn propset svn:eol-style native $FILES
|
||||
fi
|
||||
echo '>>> Remember to update Makefile.am, makefile.win32, wscript, po/POTFILES.in, geany.nsi (if necessary) <<<'
|
||||
@ -1,60 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Copyright: 2008, Nick Treleaven
|
||||
# License: GNU GPL V2 or later
|
||||
# Warranty: NONE
|
||||
|
||||
# Displays a summary of Subversion working copy changes in ChangeLog
|
||||
# format, plus warnings about any unknown files.
|
||||
|
||||
# -s for spaces instead of comma separation
|
||||
if [ "$1" = -s ]; then
|
||||
SPACES="set"
|
||||
shift
|
||||
fi
|
||||
|
||||
# -q to not print warnings
|
||||
if [ "$1" = -q ]; then
|
||||
QUIET="set"
|
||||
shift
|
||||
fi
|
||||
|
||||
status=`svn st $*`
|
||||
|
||||
# get list of files changed.
|
||||
# remove extraneous text, e.g. ? entries
|
||||
files=`echo "$status" |egrep '^[A-Z]'`
|
||||
# get filenames on one line
|
||||
files=`echo "$files" |egrep -o '[^A-Z].[ ]+(.+)' |xargs`
|
||||
# remove ChangeLog
|
||||
files=`echo "$files" |sed "s/ ChangeLog\b//"`
|
||||
# add commas if -s argument is not given
|
||||
if [ -z "$SPACES" ]; then
|
||||
files=`echo "$files" |sed "s/ /, /g"`
|
||||
fi
|
||||
|
||||
# show modifications
|
||||
if [ -n "$files" ]; then
|
||||
echo 'Changes:'
|
||||
if [ -z $SPACES ]; then
|
||||
files="${files}:"
|
||||
fi
|
||||
# indent and wrap
|
||||
OUTFILE=/tmp/fmt
|
||||
echo -n ' '$files | fmt -w 72 >$OUTFILE
|
||||
# put ' * ' for first line
|
||||
cat $OUTFILE | sed '1s/ / * /'
|
||||
else
|
||||
echo 'No changes.'
|
||||
fi
|
||||
|
||||
# warn about anything that isn't a modification or addition
|
||||
if [ -n "$QUIET" ]; then
|
||||
exit
|
||||
fi
|
||||
warn=`echo "$status" |egrep '^[^MA]'`
|
||||
if [ -n "$warn" ]; then
|
||||
echo 'Warnings:'
|
||||
echo $warn
|
||||
else
|
||||
echo 'No warnings.'
|
||||
fi
|
||||
@ -38,7 +38,7 @@
|
||||
#define INFO "<span size=\"larger\" weight=\"bold\">%s</span>"
|
||||
#define CODENAME "<span weight=\"bold\">\"" GEANY_CODENAME "\"</span>"
|
||||
#define BUILDDATE "<span size=\"smaller\">%s</span>"
|
||||
#define COPYRIGHT "Copyright (c) 2005-2012\nColomban Wendling\nNick Treleaven\nMatthew Brush\nEnrico Tröger\nFrank Lanitz\nAll rights reserved."
|
||||
#define COPYRIGHT _("Copyright (c) 2005-2012\nColomban Wendling\nNick Treleaven\nMatthew Brush\nEnrico Tröger\nFrank Lanitz\nAll rights reserved.")
|
||||
|
||||
const gchar *translators[][2] = {
|
||||
{ "ar", "Fayssal Chamekh <chamfay@gmail.com>"},
|
||||
|
||||
@ -922,10 +922,10 @@ void dialogs_show_open_font()
|
||||
g_signal_connect(GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel)->apply_button,
|
||||
"clicked", G_CALLBACK(on_font_apply_button_clicked), NULL);
|
||||
|
||||
gtk_font_selection_dialog_set_font_name(
|
||||
GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel), interface_prefs.editor_font);
|
||||
gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_fontsel), GTK_WINDOW(main_widgets.window));
|
||||
}
|
||||
gtk_font_selection_dialog_set_font_name(
|
||||
GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel), interface_prefs.editor_font);
|
||||
/* We make sure the dialog is visible. */
|
||||
gtk_window_present(GTK_WINDOW(ui_widgets.open_fontsel));
|
||||
#endif
|
||||
|
||||
@ -630,6 +630,8 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home)
|
||||
|
||||
static void styleset_common(ScintillaObject *sci, guint ft_id)
|
||||
{
|
||||
GeanyLexerStyle *style;
|
||||
|
||||
SSM(sci, SCI_STYLECLEARALL, 0, 0);
|
||||
|
||||
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) (ft_id == GEANY_FILETYPES_NONE ?
|
||||
@ -787,12 +789,17 @@ static void styleset_common(ScintillaObject *sci, guint ft_id)
|
||||
sci_set_property(sci, "fold.preprocessor", "1");
|
||||
sci_set_property(sci, "fold.at.else", "1");
|
||||
|
||||
style = &common_style_set.styling[GCS_SELECTION];
|
||||
if (!style->bold && !style->italic)
|
||||
{
|
||||
g_warning("selection style is set to invisible - ignoring!");
|
||||
style->italic = TRUE;
|
||||
style->background = 0xc0c0c0;
|
||||
}
|
||||
/* bold (3rd argument) is whether to override default foreground selection */
|
||||
if (common_style_set.styling[GCS_SELECTION].bold)
|
||||
SSM(sci, SCI_SETSELFORE, 1, invert(common_style_set.styling[GCS_SELECTION].foreground));
|
||||
SSM(sci, SCI_SETSELFORE, style->bold, invert(style->foreground));
|
||||
/* italic (4th argument) is whether to override default background selection */
|
||||
if (common_style_set.styling[GCS_SELECTION].italic)
|
||||
SSM(sci, SCI_SETSELBACK, 1, invert(common_style_set.styling[GCS_SELECTION].background));
|
||||
SSM(sci, SCI_SETSELBACK, style->italic, invert(style->background));
|
||||
|
||||
SSM(sci, SCI_SETSTYLEBITS, SSM(sci, SCI_GETSTYLEBITSNEEDED, 0, 0), 0);
|
||||
|
||||
|
||||
@ -131,6 +131,9 @@ GeanyKeyBinding *keybindings_get_item(GeanyKeyGroup *group, gsize key_id)
|
||||
/* This is used to set default keybindings on startup.
|
||||
* Menu accels are set in apply_kb_accel(). */
|
||||
/** Fills a GeanyKeyBinding struct item.
|
||||
* @note Always set @a key and @a mod to 0, otherwise you will likely
|
||||
* cause conflicts with the user's custom, other plugin's keybindings or
|
||||
* future default keybindings.
|
||||
* @param group Group.
|
||||
* @param key_id Keybinding index for the group.
|
||||
* @param callback Function to call when activated, or @c NULL to use the group callback.
|
||||
|
||||
@ -116,7 +116,8 @@ static void handler_log(const gchar *domain, GLogLevelFlags level, const gchar *
|
||||
{
|
||||
gchar *time_str;
|
||||
|
||||
if (G_LIKELY(app != NULL && app->debug_mode))
|
||||
if (G_LIKELY(app != NULL && app->debug_mode) ||
|
||||
! ((G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO | G_LOG_LEVEL_MESSAGE) & level))
|
||||
{
|
||||
#ifdef G_OS_WIN32
|
||||
/* On Windows g_log_default_handler() is not enough, we need to print it
|
||||
|
||||
@ -528,6 +528,13 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
|
||||
}
|
||||
|
||||
app->debug_mode = verbose_mode;
|
||||
if (app->debug_mode)
|
||||
{
|
||||
/* Since GLib 2.32 messages logged with levels INFO and DEBUG aren't output by the
|
||||
* default log handler unless the G_MESSAGES_DEBUG environment variable contains the
|
||||
* domain of the message or is set to the special value "all" */
|
||||
g_setenv("G_MESSAGES_DEBUG", "all", FALSE);
|
||||
}
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
win32_init_debug_code();
|
||||
|
||||
@ -325,9 +325,9 @@ void ui_update_statusbar(GeanyDocument *doc, gint pos)
|
||||
{
|
||||
const gchar sp[] = " ";
|
||||
g_string_append(stats_str, sp);
|
||||
g_string_append_printf(stats_str, "pos: %d", pos);
|
||||
g_string_append_printf(stats_str, _("pos: %d"), pos);
|
||||
g_string_append(stats_str, sp);
|
||||
g_string_append_printf(stats_str, "style: %d", sci_get_style_at(doc->editor->sci, pos));
|
||||
g_string_append_printf(stats_str, _("style: %d"), sci_get_style_at(doc->editor->sci, pos));
|
||||
}
|
||||
#endif
|
||||
/* can be overridden by status messages */
|
||||
@ -1466,7 +1466,8 @@ static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos,
|
||||
*/
|
||||
void ui_entry_add_clear_icon(GtkEntry *entry)
|
||||
{
|
||||
g_object_set(entry, "secondary-icon-stock", GTK_STOCK_CLEAR, NULL);
|
||||
g_object_set(entry, "secondary-icon-stock", GTK_STOCK_CLEAR,
|
||||
"secondary-icon-activatable", TRUE, NULL);
|
||||
g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL);
|
||||
}
|
||||
|
||||
@ -2213,11 +2214,6 @@ void ui_init_builder(void)
|
||||
return;
|
||||
|
||||
builder = gtk_builder_new();
|
||||
if (! builder)
|
||||
{
|
||||
g_error("Failed to initialize the user-interface");
|
||||
return;
|
||||
}
|
||||
|
||||
gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ GTK_INCLUDES= \
|
||||
|
||||
INCLUDEDIRS=-I ../ -I . $(GTK_INCLUDES)
|
||||
|
||||
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
|
||||
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
|
||||
ifdef DEBUG
|
||||
CFLAGS= -O0 -g $(CBASEFLAGS)
|
||||
else
|
||||
@ -33,7 +33,7 @@ CFLAGS=-O2 $(CBASEFLAGS)
|
||||
endif
|
||||
|
||||
.c.o:
|
||||
$(CC) $(REGEX_DEFINES) $(CFLAGS) -w -c $<
|
||||
$(CC) $(REGEX_DEFINES) $(CFLAGS) -c $<
|
||||
|
||||
all: $(COMPLIB)
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ GTK_INCLUDES= \
|
||||
|
||||
INCLUDEDIRS=-I include $(GTK_INCLUDES)
|
||||
|
||||
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
|
||||
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
|
||||
ifdef DEBUG
|
||||
CFLAGS= -O0 -g $(CBASEFLAGS)
|
||||
else
|
||||
@ -31,7 +31,7 @@ CFLAGS=-O2 $(CBASEFLAGS)
|
||||
endif
|
||||
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -w -c $<
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
all: $(COMPLIB)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user