Revision: 1880
http://geany.svn.sourceforge.net/geany/?rev=1880&view=rev
Author: ntrel
Date: 2007-09-13 05:38:14 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Change scroll by line default keybindings to Alt-{Up, Down}.
Change Previous/Next Paragraph Scintilla commands to Ctrl-{Up, Down}.
Adding Shift extends selection by paragraph.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/document.c
trunk/src/keybindings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-13 11:31:19 UTC (rev 1879)
+++ trunk/ChangeLog 2007-09-13 12:38:14 UTC (rev 1880)
@@ -3,6 +3,10 @@
* src/callbacks.c:
Speed up Save All for C-like files by avoiding unnecessary
recolourising after user typenames have changed.
+ * src/keybindings.c, src/document.c, doc/geany.txt, doc/geany.html:
+ Change scroll by line default keybindings to Alt-{Up, Down}.
+ Change Previous/Next Paragraph Scintilla commands to Ctrl-{Up, Down}.
+ Adding Shift extends selection by paragraph.
2007-09-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2007-09-13 11:31:19 UTC (rev 1879)
+++ trunk/doc/geany.html 2007-09-13 12:38:14 UTC (rev 1880)
@@ -2380,7 +2380,7 @@
conventions. All move keys (arrows, page up/down, home and end)
allows to extend or reduce the stream selection when holding the
Shift key, and the rectangular selection when holding the Shift and
-Alt keys. Some keys may not be available with some national keyboards
+Ctrl keys. Some keys may not be available with some national keyboards
or because they are taken by the system such as by a window manager
on GTK+. Keyboard equivalents of menu commands are listed in the
menus. Some less common commands with no menu equivalent are:</p>
@@ -2447,16 +2447,16 @@
<td>Alt+Shift+End</td>
</tr>
<tr><td>Scroll up.</td>
-<td>Ctrl+Up</td>
+<td>Alt+Up</td>
</tr>
<tr><td>Scroll down.</td>
-<td>Ctrl+Down</td>
+<td>Alt+Down</td>
</tr>
-<tr><td>Previous paragraph.</td>
-<td>Ctrl+[</td>
+<tr><td>Previous paragraph. Shift extends selection.</td>
+<td>Ctrl+Up</td>
</tr>
-<tr><td>Next paragraph.</td>
-<td>Ctrl+]</td>
+<tr><td>Next paragraph. Shift extends selection.</td>
+<td>Ctrl+Down</td>
</tr>
<tr><td>Previous word. Shift extends selection.</td>
<td>Ctrl+Left</td>
@@ -3042,7 +3042,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-09-12 15:30 UTC.
+Generated on: 2007-09-13 12:33 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2007-09-13 11:31:19 UTC (rev 1879)
+++ trunk/doc/geany.txt 2007-09-13 12:38:14 UTC (rev 1880)
@@ -2213,7 +2213,7 @@
conventions. All move keys (arrows, page up/down, home and end)
allows to extend or reduce the stream selection when holding the
Shift key, and the rectangular selection when holding the Shift and
-Alt keys. Some keys may not be available with some national keyboards
+Ctrl keys. Some keys may not be available with some national keyboards
or because they are taken by the system such as by a window manager
on GTK+. Keyboard equivalents of menu commands are listed in the
menus. Some less common commands with no menu equivalent are:
@@ -2238,10 +2238,10 @@
Extend selection to end of document. Ctrl+Shift+End
Go to end of display line. Alt+End
Extend selection to end of display line. Alt+Shift+End
-Scroll up. Ctrl+Up
-Scroll down. Ctrl+Down
-Previous paragraph. Ctrl+[
-Next paragraph. Ctrl+]
+Scroll up. Alt+Up
+Scroll down. Alt+Down
+Previous paragraph. Shift extends selection. Ctrl+Up
+Next paragraph. Shift extends selection. Ctrl+Down
Previous word. Shift extends selection. Ctrl+Left
Next word. Shift extends selection. Ctrl+Right
Previous word part. Ctrl+/
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2007-09-13 11:31:19 UTC (rev 1879)
+++ trunk/src/document.c 2007-09-13 12:38:14 UTC (rev 1880)
@@ -336,6 +336,12 @@
sci_assign_cmdkey(sci, SCK_RIGHT | (SCMOD_CTRL << 16) | (SCMOD_SHIFT << 16), SCI_WORDRIGHTENDEXTEND);
sci_assign_cmdkey(sci, SCK_DELETE | (SCMOD_CTRL << 16), SCI_DELWORDRIGHTEND);
}
+ sci_assign_cmdkey(sci, SCK_UP | (SCMOD_ALT << 16), SCI_LINESCROLLUP);
+ sci_assign_cmdkey(sci, SCK_DOWN | (SCMOD_ALT << 16), SCI_LINESCROLLDOWN);
+ sci_assign_cmdkey(sci, SCK_UP | (SCMOD_CTRL << 16), SCI_PARAUP);
+ sci_assign_cmdkey(sci, SCK_UP | (SCMOD_CTRL << 16) | (SCMOD_SHIFT << 16), SCI_PARAUPEXTEND);
+ sci_assign_cmdkey(sci, SCK_DOWN | (SCMOD_CTRL << 16), SCI_PARADOWN);
+ sci_assign_cmdkey(sci, SCK_DOWN | (SCMOD_CTRL << 16) | (SCMOD_SHIFT << 16), SCI_PARADOWNEXTEND);
}
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2007-09-13 11:31:19 UTC (rev 1879)
+++ trunk/src/keybindings.c 2007-09-13 12:38:14 UTC (rev 1880)
@@ -315,9 +315,9 @@
keys[GEANY_KEYS_EDIT_SCROLLTOLINE] = fill(cb_func_edit,
GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"));
keys[GEANY_KEYS_EDIT_SCROLLLINEUP] = fill(cb_func_edit,
- GDK_Up, GDK_CONTROL_MASK, "edit_scrolllineup", _("Scroll up the view by one line"));
+ GDK_Up, GDK_MOD1_MASK, "edit_scrolllineup", _("Scroll up the view by one line"));
keys[GEANY_KEYS_EDIT_SCROLLLINEDOWN] = fill(cb_func_edit,
- GDK_Down, GDK_CONTROL_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"));
+ GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"));
keys[GEANY_KEYS_EDIT_INSERTALTWHITESPACE] = fill(cb_func_edit,
0, 0, "edit_insertwhitespace", _("Insert alternative whitespace"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1879
http://geany.svn.sourceforge.net/geany/?rev=1879&view=rev
Author: ntrel
Date: 2007-09-13 04:31:19 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Speed up Save All for C-like files by avoiding unnecessary
recolourising after user typenames have changed.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-12 16:25:19 UTC (rev 1878)
+++ trunk/ChangeLog 2007-09-13 11:31:19 UTC (rev 1879)
@@ -1,3 +1,10 @@
+2007-09-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/callbacks.c:
+ Speed up Save All for C-like files by avoiding unnecessary
+ recolourising after user typenames have changed.
+
+
2007-09-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/plugindata.h:
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2007-09-12 16:25:19 UTC (rev 1878)
+++ trunk/src/callbacks.c 2007-09-13 11:31:19 UTC (rev 1879)
@@ -229,6 +229,8 @@
gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook));
gint cur_idx = document_get_cur_idx();
+ document_delay_colourise(); // avoid recolourising all C files after each save
+
for (i = 0; i < max; i++)
{
idx = document_get_n_idx(i);
@@ -243,6 +245,7 @@
else
document_save_file(idx, FALSE);
}
+ document_colourise_new();
treeviews_update_tag_list(cur_idx, TRUE);
ui_set_window_title(cur_idx);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1877
http://geany.svn.sourceforge.net/geany/?rev=1877&view=rev
Author: ntrel
Date: 2007-09-12 09:08:26 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Edit how to manually edit geany.conf hidden prefs.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-12 16:01:23 UTC (rev 1876)
+++ trunk/ChangeLog 2007-09-12 16:08:26 UTC (rev 1877)
@@ -15,6 +15,8 @@
Make Toggle Case use the current word if there's no selection.
Make Toggle Case keep an existing selection.
Rename ui_widgets.popup_items to popup_copy_items.
+ * doc/geany.txt, doc/geany.html:
+ Edit how to manually edit geany.conf hidden prefs.
2007-09-11 Enrico Tröger <enrico.troeger(a)uvena.de>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2007-09-12 16:01:23 UTC (rev 1876)
+++ trunk/doc/geany.html 2007-09-12 16:08:26 UTC (rev 1877)
@@ -2477,12 +2477,18 @@
<div class="section">
<h1><a class="toc-backref" href="#id103" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1>
<p>There are some uncommon preferences that are not shown in the
-Preferences dialog. These can be set by using a second instance of
-Geany to edit <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>. After saving the file, restart
-the first instance, and the new settings will be used. Otherwise,
-the configuration file changes are overwritten when Geany is closed.</p>
-<p>The table below refers to the key names in the configuration file, under the
-<tt class="docutils literal"><span class="pre">[geany]</span></tt> group.</p>
+Preferences dialog. These can be set in two ways:</p>
+<ol class="arabic simple">
+<li>By quitting all instances of Geany and using another editor to edit
+<tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>.</li>
+<li>By using Geany to edit <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>, then after saving
+the file, start a second instance of Geany, and the new settings
+will be used. Make sure to then quit the first instance.</li>
+</ol>
+<p>Otherwise, the configuration file changes are overwritten when Geany
+is closed.</p>
+<p>The table below refers to the key names in the configuration file,
+under the <tt class="docutils literal"><span class="pre">[geany]</span></tt> group.</p>
<table border="1" class="docutils">
<colgroup>
<col width="33%" />
@@ -3036,7 +3042,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-09-12 11:56 UTC.
+Generated on: 2007-09-12 15:30 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2007-09-12 16:01:23 UTC (rev 1876)
+++ trunk/doc/geany.txt 2007-09-12 16:08:26 UTC (rev 1877)
@@ -2255,14 +2255,20 @@
==================
There are some uncommon preferences that are not shown in the
-Preferences dialog. These can be set by using a second instance of
-Geany to edit ``~/.geany/geany.conf``. After saving the file, restart
-the first instance, and the new settings will be used. Otherwise,
-the configuration file changes are overwritten when Geany is closed.
+Preferences dialog. These can be set in two ways:
-The table below refers to the key names in the configuration file, under the
-``[geany]`` group.
+1. By quitting all instances of Geany and using another editor to edit
+ ``~/.geany/geany.conf``.
+2. By using Geany to edit ``~/.geany/geany.conf``, then after saving
+ the file, start a second instance of Geany, and the new settings
+ will be used. Make sure to then quit the first instance.
+Otherwise, the configuration file changes are overwritten when Geany
+is closed.
+
+The table below refers to the key names in the configuration file,
+under the ``[geany]`` group.
+
============================== ============================================ ==================
Option Description Default
============================== ============================================ ==================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.