Permalink
Browse files

Merge remote-tracking branch 'origin/master' into tm/tree-refactoring

  • Loading branch information...
2 parents 18cec1f + 177d642 commit 9f99b4f55ad4a1adae4d2db7858b91e95e81c8ad @ntrel ntrel committed Jun 7, 2012
Showing with 102,978 additions and 95,029 deletions.
  1. +2 −0 NEWS
  2. +1 −1 data/colorschemes/alt.conf
  3. +1 −1 data/filetypes.common
  4. +1 −1 data/geany.glade
  5. +17 −6 doc/geany.html
  6. +16 −4 doc/geany.txt
  7. +25 −25 doc/plugins.dox
  8. +543 −478 po/ar.po
  9. +3,114 −2,993 po/ast.po
  10. +3,094 −2,967 po/be.po
  11. +3,214 −3,097 po/bg.po
  12. +3,100 −2,979 po/ca.po
  13. +3,105 −2,984 po/cs.po
  14. +57 −30 po/de.po
  15. +3,206 −3,085 po/el.po
  16. +3,101 −2,980 po/en_GB.po
  17. +3,147 −3,033 po/es.po
  18. +3,094 −2,973 po/fa.po
  19. +3,235 −3,101 po/fi.po
  20. +3,129 −3,015 po/fr.po
  21. +3,121 −3,000 po/gl.po
  22. +3,473 −3,170 po/hu.po
  23. +1,835 −1,765 po/id.po
  24. +1,527 −1,489 po/it.po
  25. +3,023 −2,914 po/ja.po
  26. +1,598 −1,527 po/kk.po
  27. +3,111 −2,994 po/ko.po
  28. +3,134 −3,014 po/lb.po
  29. +309 −276 po/lt.po
  30. +5,621 −1,625 po/mn.po
  31. +3,110 −2,983 po/nl.po
  32. +1,362 −1,296 po/nn.po
  33. +3,111 −2,952 po/pl.po
  34. +3,068 −2,963 po/pt.po
  35. +3,117 −2,996 po/pt_BR.po
  36. +3,150 −3,035 po/ro.po
  37. +3,104 −2,983 po/ru.po
  38. +976 −947 po/sk.po
  39. +3,383 −3,209 po/sl.po
  40. +1,340 −1,313 po/sv.po
  41. +3,013 −2,892 po/tr.po
  42. +3,141 −3,021 po/uk.po
  43. +3,115 −2,994 po/vi.po
  44. +2,939 −2,818 po/zh_CN.po
  45. +3,056 −3,007 po/zh_TW.po
  46. +5 −5 scintilla/makefile.win32
  47. +0 −8 scripts/svn-add.sh
  48. +0 −60 scripts/svn-changes.sh
  49. +1 −1 src/about.c
  50. +2 −2 src/dialogs.c
  51. +11 −4 src/highlighting.c
  52. +3 −0 src/keybindings.c
  53. +2 −1 src/log.c
  54. +7 −0 src/main.c
  55. +4 −8 src/ui_utils.c
  56. +2 −2 tagmanager/ctags/makefile.win32
  57. +2 −2 tagmanager/mio/makefile.win32
View
@@ -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
View
@@ -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>
View
@@ -2159,8 +2159,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<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 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<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 &quot;reST&quot;). 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 &quot;<tt class="docutils literal">make doc</tt>&quot; 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 &quot;<tt class="docutils literal">make pdf</tt>&quot; 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 &gt; foo.patch
+% git diff geany.txt &gt; 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 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<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>
View
@@ -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.
View
@@ -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
- *
- * 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.
- *
- * 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.
+ * 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/
+ *
+ * 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.
+ *
+ * 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
Oops, something went wrong.

0 comments on commit 9f99b4f

Please sign in to comment.