Add 'Max. symbol name suggestions' autocompletion pref.
Edit some autocompletion pref strings. Remove some trailing commas in array initializers (oops). Move GEANY_TOGGLE_MARK, GEANY_MAX_AUTOCOMPLETE_WORDS to keyfile.c. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2914 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven
parent
075fae6a64
commit
6f60b4bc2c
@ -5,6 +5,13 @@
|
||||
Mention that usually building GTK manually is not necessary.
|
||||
Run 'make install' as root.
|
||||
Add some subsection titles.
|
||||
* src/interface.c, src/prefs.c, src/keyfile.c, src/editor.c,
|
||||
src/symbols.c, src/editor.h, doc/geany.txt, doc/geany.html,
|
||||
geany.glade:
|
||||
Add 'Max. symbol name suggestions' autocompletion pref.
|
||||
Edit some autocompletion pref strings.
|
||||
Remove some trailing commas in array initializers (oops).
|
||||
Move GEANY_TOGGLE_MARK, GEANY_MAX_AUTOCOMPLETE_WORDS to keyfile.c.
|
||||
|
||||
|
||||
2008-08-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
|
||||
<title>Geany</title>
|
||||
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
|
||||
<meta name="date" content="2008-08-27" />
|
||||
<meta name="date" content="2008-08-29" />
|
||||
<style type="text/css">
|
||||
|
||||
/*
|
||||
@ -139,7 +139,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
|
||||
<br />Nick Treleaven
|
||||
<br />Frank Lanitz</td></tr>
|
||||
<tr><th class="docinfo-name">Date:</th>
|
||||
<td>2008-08-27</td></tr>
|
||||
<td>2008-08-29</td></tr>
|
||||
<tr><th class="docinfo-name">Version:</th>
|
||||
<td>0.15</td></tr>
|
||||
</tbody>
|
||||
@ -475,9 +475,9 @@ $ ./configure --help
|
||||
</pre>
|
||||
<p>You may also want to read the INSTALL file for advanced installation
|
||||
options.</p>
|
||||
<p>There also some compile time options which can be found in
|
||||
<tt class="docutils literal"><span class="pre">src/geany.h</span></tt>. Please see <a class="reference" href="#compile-time-options">Compile-time options</a> for more
|
||||
information.</p>
|
||||
<ul class="simple">
|
||||
<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3>
|
||||
@ -3793,17 +3793,6 @@ matching options.</td>
|
||||
a-z, A-Z, 0-9 and
|
||||
underscore.</td>
|
||||
</tr>
|
||||
<tr><td>GEANY_TOGGLE_MARK</td>
|
||||
<td>A string which is used to mark a toggled
|
||||
comment.
|
||||
external changes.</td>
|
||||
<td>"~ "</td>
|
||||
</tr>
|
||||
<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td>
|
||||
<td>How many auto completion suggestions should
|
||||
Geany provide.</td>
|
||||
<td>30</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -3875,6 +3864,16 @@ open files.</td>
|
||||
<td>The font used in the editor window.</td>
|
||||
<td>"Monospace 10"</td>
|
||||
</tr>
|
||||
<tr><td>GEANY_TOGGLE_MARK</td>
|
||||
<td>A string which is used to mark a toggled
|
||||
comment.</td>
|
||||
<td>"~ "</td>
|
||||
</tr>
|
||||
<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td>
|
||||
<td>How many auto completion suggestions should
|
||||
Geany provide.</td>
|
||||
<td>30</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -4245,7 +4244,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
|
||||
<div class="footer">
|
||||
<hr class="footer" />
|
||||
<a class="reference" href="geany.txt">View document source</a>.
|
||||
Generated on: 2008-08-29 12:35 UTC.
|
||||
Generated on: 2008-08-29 16:53 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>
|
||||
|
||||
@ -140,9 +140,7 @@ list, type::
|
||||
You may also want to read the INSTALL file for advanced installation
|
||||
options.
|
||||
|
||||
There also some compile time options which can be found in
|
||||
``src/geany.h``. Please see `Compile-time options`_ for more
|
||||
information.
|
||||
* See also `Compile-time options`_.
|
||||
|
||||
Dynamic linking loader support
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
@ -3318,11 +3316,6 @@ Option Description De
|
||||
GEANY_WORDCHARS These characters define word boundaries when a string with:
|
||||
making selections and searching using word a-z, A-Z, 0-9 and
|
||||
matching options. underscore.
|
||||
GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ "
|
||||
comment.
|
||||
external changes.
|
||||
GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30
|
||||
Geany provide.
|
||||
============================== ============================================ ==================
|
||||
|
||||
keyfile.c
|
||||
@ -3352,6 +3345,10 @@ GEANY_DEFAULT_FONT_SYMBOL_LIST The font used in sidebar to show symbols and "S
|
||||
open files.
|
||||
GEANY_DEFAULT_FONT_MSG_WINDOW The font used in the messages window. "Sans 9"
|
||||
GEANY_DEFAULT_FONT_EDITOR The font used in the editor window. "Monospace 10"
|
||||
GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ "
|
||||
comment.
|
||||
GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30
|
||||
Geany provide.
|
||||
============================== ============================================ ==================
|
||||
|
||||
|
||||
|
||||
136
geany.glade
136
geany.glade
@ -6137,7 +6137,7 @@ Match braces</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment.</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Automatic continuation multi-line comments</property>
|
||||
<property name="label" translatable="yes">Automatic continuation of multi-line comments</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
@ -6175,30 +6175,64 @@ Match braces</property>
|
||||
<child>
|
||||
<widget class="GtkTable" id="table14">
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">2</property>
|
||||
<property name="n_rows">3</property>
|
||||
<property name="n_columns">2</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">3</property>
|
||||
<property name="column_spacing">12</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="spin_symbollistheight">
|
||||
<widget class="GtkLabel" id="label223">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Number of rows to display in the auto completion list.</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="digits">0</property>
|
||||
<property name="numeric">True</property>
|
||||
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
|
||||
<property name="snap_to_ticks">False</property>
|
||||
<property name="label" translatable="yes">Max. symbol name suggestions:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="adjustment">9 1 99 1 10 10</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label173">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Completion list height:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
@ -6231,34 +6265,6 @@ Match braces</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label173">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Rows of symbol completion list:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="spin_symbol_complete_chars">
|
||||
<property name="visible">True</property>
|
||||
@ -6280,11 +6286,55 @@ Match braces</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="spin_symbollistheight">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Display height in rows for the auto completion list.</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="digits">0</property>
|
||||
<property name="numeric">True</property>
|
||||
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
|
||||
<property name="snap_to_ticks">False</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="adjustment">9 1 99 1 10 10</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="spin_autocompletion_max_entries">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Maximum number of entries to display in the auto completion list.</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="digits">0</property>
|
||||
<property name="numeric">True</property>
|
||||
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
|
||||
<property name="snap_to_ticks">False</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="adjustment">9 1 10000 1 10 10</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
@ -1379,9 +1379,10 @@ autocomplete_html(ScintillaObject *sci, const gchar *root, gsize rootlen)
|
||||
}
|
||||
|
||||
|
||||
/* Current document & global tags autocompletion */
|
||||
static gboolean
|
||||
autocomplete_tags(GeanyDocument *doc, const gchar *root, gsize rootlen)
|
||||
{ /* PHP, LaTeX, C, C++, D and Java tag autocompletion */
|
||||
{
|
||||
TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 };
|
||||
const GPtrArray *tags;
|
||||
ScintillaObject *sci;
|
||||
@ -1396,7 +1397,7 @@ autocomplete_tags(GeanyDocument *doc, const gchar *root, gsize rootlen)
|
||||
GString *words = g_string_sized_new(150);
|
||||
guint j;
|
||||
|
||||
for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j)
|
||||
for (j = 0; ((j < tags->len) && (j < editor_prefs.autocompletion_max_entries)); ++j)
|
||||
{
|
||||
if (j > 0) g_string_append_c(words, '\n');
|
||||
g_string_append(words, ((TMTag *) tags->pdata[j])->name);
|
||||
|
||||
@ -29,9 +29,7 @@
|
||||
#include "ScintillaWidget.h"
|
||||
|
||||
#define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
||||
#define GEANY_TOGGLE_MARK "~ "
|
||||
#define GEANY_MAX_WORD_LENGTH 192
|
||||
#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
|
||||
|
||||
/* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */
|
||||
#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
|
||||
@ -106,6 +104,7 @@ typedef struct GeanyEditorPrefs
|
||||
gint line_break_column;
|
||||
gboolean auto_continue_multiline;
|
||||
gchar *comment_toggle_mark;
|
||||
guint autocompletion_max_entries;
|
||||
} GeanyEditorPrefs;
|
||||
|
||||
extern GeanyEditorPrefs editor_prefs;
|
||||
|
||||
@ -2731,12 +2731,15 @@ create_prefs_dialog (void)
|
||||
GtkWidget *check_auto_multiline;
|
||||
GtkWidget *check_symbol_auto_completion;
|
||||
GtkWidget *table14;
|
||||
GtkObject *spin_symbollistheight_adj;
|
||||
GtkWidget *spin_symbollistheight;
|
||||
GtkWidget *label205;
|
||||
GtkWidget *label223;
|
||||
GtkWidget *label173;
|
||||
GtkWidget *label205;
|
||||
GtkObject *spin_symbol_complete_chars_adj;
|
||||
GtkWidget *spin_symbol_complete_chars;
|
||||
GtkObject *spin_symbollistheight_adj;
|
||||
GtkWidget *spin_symbollistheight;
|
||||
GtkObject *spin_autocompletion_max_entries_adj;
|
||||
GtkWidget *spin_autocompletion_max_entries;
|
||||
GtkWidget *label177;
|
||||
GtkWidget *label212;
|
||||
GtkWidget *vbox24;
|
||||
@ -3849,7 +3852,7 @@ create_prefs_dialog (void)
|
||||
gtk_tooltips_set_tip (tooltips, check_xmltag, _("Automatic completion and closing of XML tags (includes HTML tags)"), NULL);
|
||||
gtk_button_set_focus_on_click (GTK_BUTTON (check_xmltag), FALSE);
|
||||
|
||||
check_auto_multiline = gtk_check_button_new_with_mnemonic (_("Automatic continuation multi-line comments"));
|
||||
check_auto_multiline = gtk_check_button_new_with_mnemonic (_("Automatic continuation of multi-line comments"));
|
||||
gtk_widget_show (check_auto_multiline);
|
||||
gtk_box_pack_start (GTK_BOX (vbox19), check_auto_multiline, FALSE, FALSE, 0);
|
||||
gtk_tooltips_set_tip (tooltips, check_auto_multiline, _("Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment."), NULL);
|
||||
@ -3861,20 +3864,25 @@ create_prefs_dialog (void)
|
||||
gtk_tooltips_set_tip (tooltips, check_symbol_auto_completion, _("Automatic completion of known symbols in open files (function names, global variables, ...)"), NULL);
|
||||
gtk_button_set_focus_on_click (GTK_BUTTON (check_symbol_auto_completion), FALSE);
|
||||
|
||||
table14 = gtk_table_new (2, 2, FALSE);
|
||||
table14 = gtk_table_new (3, 2, FALSE);
|
||||
gtk_widget_show (table14);
|
||||
gtk_box_pack_start (GTK_BOX (vbox19), table14, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox19), table14, FALSE, FALSE, 0);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table14), 3);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table14), 12);
|
||||
|
||||
spin_symbollistheight_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10);
|
||||
spin_symbollistheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbollistheight_adj), 1, 0);
|
||||
gtk_widget_show (spin_symbollistheight);
|
||||
gtk_table_attach (GTK_TABLE (table14), spin_symbollistheight, 1, 2, 1, 2,
|
||||
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
||||
label223 = gtk_label_new (_("Max. symbol name suggestions:"));
|
||||
gtk_widget_show (label223);
|
||||
gtk_table_attach (GTK_TABLE (table14), label223, 0, 1, 2, 3,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_tooltips_set_tip (tooltips, spin_symbollistheight, _("Number of rows to display in the auto completion list."), NULL);
|
||||
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbollistheight), TRUE);
|
||||
gtk_misc_set_alignment (GTK_MISC (label223), 0, 0.5);
|
||||
|
||||
label173 = gtk_label_new (_("Completion list height:"));
|
||||
gtk_widget_show (label173);
|
||||
gtk_table_attach (GTK_TABLE (table14), label173, 0, 1, 1, 2,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_misc_set_alignment (GTK_MISC (label173), 0, 0.5);
|
||||
|
||||
label205 = gtk_label_new (_("Characters to type for completion:"));
|
||||
gtk_widget_show (label205);
|
||||
@ -3883,13 +3891,6 @@ create_prefs_dialog (void)
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_misc_set_alignment (GTK_MISC (label205), 0, 0.5);
|
||||
|
||||
label173 = gtk_label_new (_("Rows of symbol completion list:"));
|
||||
gtk_widget_show (label173);
|
||||
gtk_table_attach (GTK_TABLE (table14), label173, 0, 1, 1, 2,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_misc_set_alignment (GTK_MISC (label173), 0, 0.5);
|
||||
|
||||
spin_symbol_complete_chars_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10);
|
||||
spin_symbol_complete_chars = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbol_complete_chars_adj), 1, 0);
|
||||
gtk_widget_show (spin_symbol_complete_chars);
|
||||
@ -3899,6 +3900,24 @@ create_prefs_dialog (void)
|
||||
gtk_tooltips_set_tip (tooltips, spin_symbol_complete_chars, _("The amount of characters which are necessary to show the symbol auto completion list."), NULL);
|
||||
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbol_complete_chars), TRUE);
|
||||
|
||||
spin_symbollistheight_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10);
|
||||
spin_symbollistheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbollistheight_adj), 1, 0);
|
||||
gtk_widget_show (spin_symbollistheight);
|
||||
gtk_table_attach (GTK_TABLE (table14), spin_symbollistheight, 1, 2, 1, 2,
|
||||
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_tooltips_set_tip (tooltips, spin_symbollistheight, _("Display height in rows for the auto completion list."), NULL);
|
||||
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbollistheight), TRUE);
|
||||
|
||||
spin_autocompletion_max_entries_adj = gtk_adjustment_new (9, 1, 10000, 1, 10, 10);
|
||||
spin_autocompletion_max_entries = gtk_spin_button_new (GTK_ADJUSTMENT (spin_autocompletion_max_entries_adj), 1, 0);
|
||||
gtk_widget_show (spin_autocompletion_max_entries);
|
||||
gtk_table_attach (GTK_TABLE (table14), spin_autocompletion_max_entries, 1, 2, 2, 3,
|
||||
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_tooltips_set_tip (tooltips, spin_autocompletion_max_entries, _("Maximum number of entries to display in the auto completion list."), NULL);
|
||||
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocompletion_max_entries), TRUE);
|
||||
|
||||
label177 = gtk_label_new (_("<b>Completions</b>"));
|
||||
gtk_widget_show (label177);
|
||||
gtk_frame_set_label_widget (GTK_FRAME (frame18), label177);
|
||||
@ -4988,10 +5007,12 @@ create_prefs_dialog (void)
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_multiline, "check_auto_multiline");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, check_symbol_auto_completion, "check_symbol_auto_completion");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, table14, "table14");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbollistheight, "spin_symbollistheight");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label205, "label205");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label223, "label223");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label173, "label173");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label205, "label205");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbol_complete_chars, "spin_symbol_complete_chars");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbollistheight, "spin_symbollistheight");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocompletion_max_entries, "spin_autocompletion_max_entries");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, label212, "label212");
|
||||
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox24, "vbox24");
|
||||
|
||||
@ -80,6 +80,8 @@
|
||||
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9"
|
||||
#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9"
|
||||
#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10"
|
||||
#define GEANY_TOGGLE_MARK "~ "
|
||||
#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
|
||||
|
||||
|
||||
static gchar *scribble_text = NULL;
|
||||
@ -118,7 +120,7 @@ static void bool_settings_foreach(GKeyFile *config, SettingCallbackAction action
|
||||
{&search_prefs.use_current_word, PACKAGE, "pref_main_search_use_current_word", (gpointer)TRUE},
|
||||
{&search_prefs.use_current_file_dir, "search", "pref_search_current_file_dir", (gpointer)TRUE},
|
||||
|
||||
{&editor_prefs.indentation->detect_type, PACKAGE, "check_detect_indent", (gpointer)FALSE},
|
||||
{&editor_prefs.indentation->detect_type, PACKAGE, "check_detect_indent", (gpointer)FALSE}
|
||||
};
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(items); i++)
|
||||
@ -150,6 +152,8 @@ static void int_settings_foreach(GKeyFile *config, SettingCallbackAction action)
|
||||
{&editor_prefs.indentation->auto_indent_mode, PACKAGE, "indent_mode",
|
||||
(gpointer)GEANY_AUTOINDENT_CURRENTCHARS},
|
||||
{&editor_prefs.indentation->type, PACKAGE, "indent_type", (gpointer)GEANY_INDENT_TYPE_TABS},
|
||||
{&editor_prefs.autocompletion_max_entries, PACKAGE, "autocompletion_max_entries",
|
||||
(gpointer)GEANY_MAX_AUTOCOMPLETE_WORDS}
|
||||
};
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(items); i++)
|
||||
|
||||
@ -145,6 +145,7 @@ static void spin_prefs_foreach(PrefCallbackAction action)
|
||||
{
|
||||
{"spin_indent_width", &editor_prefs.indentation->width},
|
||||
{"spin_tab_width", &editor_prefs.indentation->hard_tab_width},
|
||||
{"spin_autocompletion_max_entries", &editor_prefs.autocompletion_max_entries}
|
||||
};
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(items); i++)
|
||||
@ -181,7 +182,7 @@ static void radio_prefs_foreach(PrefCallbackAction action)
|
||||
{
|
||||
{"radio_indent_spaces", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_SPACES},
|
||||
{"radio_indent_tabs", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_TABS},
|
||||
{"radio_indent_both", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_BOTH},
|
||||
{"radio_indent_both", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_BOTH}
|
||||
};
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(items); i++)
|
||||
@ -210,7 +211,7 @@ static void combo_prefs_foreach(PrefCallbackAction action)
|
||||
guint i;
|
||||
PrefEntry items[] =
|
||||
{
|
||||
{"combo_auto_indent_mode", &editor_prefs.indentation->auto_indent_mode},
|
||||
{"combo_auto_indent_mode", &editor_prefs.indentation->auto_indent_mode}
|
||||
};
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(items); i++)
|
||||
|
||||
@ -273,7 +273,7 @@ GString *symbols_get_macro_list(void)
|
||||
tm_tag_enum_t | tm_tag_variable_t | tm_tag_macro_t | tm_tag_macro_with_arg_t);
|
||||
if (NULL != tags)
|
||||
{
|
||||
for (i = 0; ((i < tags->len) && (i < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++i)
|
||||
for (i = 0; ((i < tags->len) && (i < editor_prefs.autocompletion_max_entries)); ++i)
|
||||
{
|
||||
g_ptr_array_add(ftags, (gpointer) tags->pdata[i]);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user