Commits March 2008

commits@lists.geany.org

3 participants
133 discussions

SF.net SVN: geany: [2381] trunk
by ntrel＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2381 http://geany.svn.sourceforge.net/geany/?rev=2381&view=rev Author: ntrel Date: 2008-03-21 09:59:30 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Replace untitled file header filename after Save As and add to recent files on Windows too. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 16:47:17 UTC (rev 2380) +++ trunk/ChangeLog 2008-03-21 16:59:30 UTC (rev 2381) @@ -22,6 +22,9 @@ * src/win32.c, src/dialogs.c, src/document.c, src/document.h: Only use filetype detection after Save As, not on every save when the filetype is None (fixes #1891778). + * src/dialogs.c, src/document.c: + Replace untitled file header filename after Save As and add to recent + files on Windows too. 2008-03-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-03-21 16:47:17 UTC (rev 2380) +++ trunk/src/dialogs.c 2008-03-21 16:59:30 UTC (rev 2381) @@ -410,14 +410,10 @@ doc_list[idx].file_name = g_strdup(utf8_filename); } - utils_replace_filename(idx); document_save_file_as(idx); if (! open_new_tab) build_menu_update(idx); - - /* finally add current file to recent files menu */ - ui_add_recent_file(doc_list[idx].file_name); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-03-21 16:47:17 UTC (rev 2380) +++ trunk/src/document.c 2008-03-21 16:59:30 UTC (rev 2381) @@ -1262,6 +1262,8 @@ */ gboolean document_save_file_as(gint idx) { + gboolean ret; + if (! DOC_IDX_VALID(idx)) return FALSE; /* detect filetype */ @@ -1277,7 +1279,12 @@ app->ignore_callback = FALSE; } } - return document_save_file(idx, TRUE); + utils_replace_filename(idx); + + ret = document_save_file(idx, TRUE); + if (ret) + ui_add_recent_file(doc_list[idx].file_name); + return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2380] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2380 http://geany.svn.sourceforge.net/geany/?rev=2380&view=rev Author: eht16 Date: 2008-03-21 09:47:17 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Update TCL parser from CTags SVN which adds new symbol types for classes and methods (closes #1918748). Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/tcl.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 15:58:21 UTC (rev 2379) +++ trunk/ChangeLog 2008-03-21 16:47:17 UTC (rev 2380) @@ -8,6 +8,9 @@ documentation. * data/snippets.conf: Add better "for" completion for Python. + * tagmanager/tcl.c, src/symbols.c: + Update TCL parser from CTags SVN which adds new symbol types for + classes and methods (closes #1918748). 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-03-21 15:58:21 UTC (rev 2379) +++ trunk/src/symbols.c 2008-03-21 16:47:17 UTC (rev 2380) @@ -648,6 +648,7 @@ /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } + case GEANY_FILETYPES_TCL: case GEANY_FILETYPES_PYTHON: { tag_list_add_groups(tag_store, Modified: trunk/tagmanager/tcl.c =================================================================== --- trunk/tagmanager/tcl.c 2008-03-21 15:58:21 UTC (rev 2379) +++ trunk/tagmanager/tcl.c 2008-03-21 16:47:17 UTC (rev 2380) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 2000-2001, Darren Hiebert +* Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -11,7 +12,7 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> @@ -23,60 +24,93 @@ * DATA DEFINITIONS */ typedef enum { - K_PROCEDURE + K_CLASS, K_METHOD, K_PROCEDURE } tclKind; static kindOption TclKinds [] = { - { TRUE, 'f', "function", "procedures" } + { TRUE, 'c', "class", "classes" }, + { TRUE, 'm', "member", "methods" }, + { TRUE, 'p', "function", "procedures" } }; /* * FUNCTION DEFINITIONS */ +static const unsigned char *makeTclTag ( + const unsigned char *cp, + vString *const name, + const tclKind kind) +{ + vStringClear (name); + while ((int) *cp != '\0' && ! isspace ((int) *cp)) + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, TclKinds, kind); + return cp; +} + +static boolean match (const unsigned char *line, const char *word) +{ + return (boolean) (strncmp ((const char*) line, word, strlen (word)) == 0); +} + static void findTclTags (void) { - vString *name = vStringNew (); - const unsigned char *line; + vString *name = vStringNew (); + const unsigned char *line; - while ((line = fileReadLine ()) != NULL) - { - int i; + while ((line = fileReadLine ()) != NULL) + { + const unsigned char *cp; - if (line [0] == '\0' || line [0] == '#') - continue; + while (isspace (line [0])) + ++line; - /* read first word */ - for (i = 0 ; line [i] != '\0' && ! isspace (line [i]) ; ++i) - ; + if (line [0] == '\0' || line [0] == '#') + continue; - if (strncmp ((const char*) line, "proc", (size_t) 4) == 0) - { - const unsigned char *cp = line + i; - while (isspace ((int) *cp)) - ++cp; - while (line [i] != '\0' && ! isspace ((int) *cp)) - { - vStringPut (name, (int) *cp); - ++cp; - } - vStringTerminate (name); - makeSimpleTag (name, TclKinds, K_PROCEDURE); - vStringClear (name); + /* read first word */ + for (cp = line ; *cp != '\0' && ! isspace ((int) *cp) ; ++cp) + ; + if (! isspace ((int) *cp)) + continue; + while (isspace ((int) *cp)) + ++cp; + /* Now `line' points at first word and `cp' points at next word */ + + if (match (line, "proc")) + cp = makeTclTag (cp, name, K_PROCEDURE); + else if (match (line, "class") || match (line, "itcl::class")) + cp = makeTclTag (cp, name, K_CLASS); + else if (match (line, "public") || + match (line, "protected") || + match (line, "private")) + { + if (match (cp, "method")) + { + cp += 6; + while (isspace ((int) *cp)) + ++cp; + cp = makeTclTag (cp, name, K_METHOD); + } + } } - } - vStringDelete (name); + vStringDelete (name); } extern parserDefinition* TclParser (void) { - static const char *const extensions [] = { "tcl", "tk", "wish", NULL }; - parserDefinition* def = parserNew ("Tcl"); - def->kinds = TclKinds; - def->kindCount = KIND_COUNT (TclKinds); - def->extensions = extensions; - def->parser = findTclTags; - return def; + static const char *const extensions [] = { "tcl", "tk", "wish", "itcl", NULL }; + parserDefinition* def = parserNew ("Tcl"); + def->kinds = TclKinds; + def->kindCount = KIND_COUNT (TclKinds); + def->extensions = extensions; + def->parser = findTclTags; + return def; } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2379] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2379 http://geany.svn.sourceforge.net/geany/?rev=2379&view=rev Author: eht16 Date: 2008-03-21 08:58:21 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Add better "for" completion for Python. Modified Paths: -------------- trunk/ChangeLog trunk/data/snippets.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 14:28:26 UTC (rev 2378) +++ trunk/ChangeLog 2008-03-21 15:58:21 UTC (rev 2379) @@ -6,6 +6,8 @@ * src/prefix.h, src/main.c, src/Makefile.am, doc/Makefile.am: Use configure's --docdir option when installing and using the documentation. + * data/snippets.conf: + Add better "for" completion for Python. 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/data/snippets.conf =================================================================== --- trunk/data/snippets.conf 2008-03-21 14:28:26 UTC (rev 2378) +++ trunk/data/snippets.conf 2008-03-21 15:58:21 UTC (rev 2379) @@ -42,6 +42,9 @@ [PHP] for=for ($i = 0; $i < %cursor%; $i++)%brace_open%\n%brace_close% +[Python] +for=for i in range()\n\t + [Ferite] iferr=iferr%block_cursor%fix%block% monitor=monitor%block_cursor%handle%block% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2378] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2378 http://geany.svn.sourceforge.net/geany/?rev=2378&view=rev Author: eht16 Date: 2008-03-21 07:28:26 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Use configure's --docdir option when installing and using the documentation. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am trunk/src/Makefile.am trunk/src/main.c trunk/src/prefix.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 14:02:59 UTC (rev 2377) +++ trunk/ChangeLog 2008-03-21 14:28:26 UTC (rev 2378) @@ -3,6 +3,9 @@ * src/callbacks.c: When opening the manual on the website, include version string to ensure the appropriate manual version is shown. + * src/prefix.h, src/main.c, src/Makefile.am, doc/Makefile.am: + Use configure's --docdir option when installing and using the + documentation. 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-03-21 14:02:59 UTC (rev 2377) +++ trunk/doc/Makefile.am 2008-03-21 14:28:26 UTC (rev 2378) @@ -1,5 +1,5 @@ man_MANS=geany.1 -DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@ +DOCDIR = $(DESTDIR)/$(docdir) IMAGE_FILES = images/*.png EXTRA_DIST = geany.html geany.css geany.txt geany.1 plugins.dox plugin-symbols.c \ $(srcdir)/$(IMAGE_FILES) Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-03-21 14:02:59 UTC (rev 2377) +++ trunk/src/Makefile.am 2008-03-21 14:28:26 UTC (rev 2378) @@ -80,8 +80,9 @@ -lcomctl32 -liberty -lwsock32 geany_private.res AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ + -DGEANY_DOCDIR=\"\" \ + -DGEANY_LIBDIR=\"\" \ -DGEANY_LOCALEDIR=\"data\" \ - -DGEANY_LIBDIR=\"\" \ -DGEANY_PREFIX=\"\" geany_LDFLAGS = -mwindows -mms-bitfields @@ -102,6 +103,7 @@ geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ + -DGEANY_DOCDIR=\""$(docdir)"\" \ -DGEANY_LIBDIR=\""$(libdir)"\" \ -DGEANY_LOCALEDIR=\""$(localedir)"\" \ -DGEANY_PREFIX=\""$(prefix)"\" Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-03-21 14:02:59 UTC (rev 2377) +++ trunk/src/main.c 2008-03-21 14:28:26 UTC (rev 2378) @@ -436,7 +436,7 @@ g_free(install_dir); #else data_dir = g_strconcat(GEANY_DATADIR, "/geany/", NULL); /* e.g. /usr/share/geany */ - doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany/html/", NULL); + doc_dir = g_strconcat(GEANY_DOCDIR, "/html/", NULL); #endif /* convert path names to locale encoding */ Modified: trunk/src/prefix.h =================================================================== --- trunk/src/prefix.h 2008-03-21 14:02:59 UTC (rev 2377) +++ trunk/src/prefix.h 2008-03-21 14:28:26 UTC (rev 2378) @@ -63,6 +63,7 @@ #undef GEANY_PREFIX #undef GEANY_DATADIR #undef GEANY_LIBDIR + #undef GEANY_DOCDIR #undef GEANY_LOCALEDIR #define SELFPATH (br_thread_local_store (br_locate ((void *) ""))) @@ -76,6 +77,7 @@ #define GEANY_PREFIX (br_thread_local_store (br_locate_prefix ((void *) ""))) #define GEANY_DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) #define GEANY_LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib"))) + #define GEANY_DOCDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/doc/geany"))) #define GEANY_LOCALEDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale"))) #endif /* BR_NO_MACROS */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2377] trunk
by ntrel＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2377 http://geany.svn.sourceforge.net/geany/?rev=2377&view=rev Author: ntrel Date: 2008-03-21 07:02:59 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Only use filetype detection after Save As, not on every save when the filetype is None (fixes #1891778). Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 13:42:31 UTC (rev 2376) +++ trunk/ChangeLog 2008-03-21 14:02:59 UTC (rev 2377) @@ -11,6 +11,9 @@ When closing tabs that were opened left-to-right, don't temporarily focus the previous tab when closing tabs, to prevent unnecessary checking for disk changes. + * src/win32.c, src/dialogs.c, src/document.c, src/document.h: + Only use filetype detection after Save As, not on every save when the + filetype is None (fixes #1891778). 2008-03-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-03-21 13:42:31 UTC (rev 2376) +++ trunk/src/dialogs.c 2008-03-21 14:02:59 UTC (rev 2377) @@ -386,7 +386,7 @@ g_return_if_fail(NZV(utf8_filename)); if (open_new_tab) - { /* "open" the saved file in a new tab */ + { /* "open" the saved file in a new tab and switch to it */ idx = document_clone(idx, utf8_filename); } else @@ -411,7 +411,7 @@ } utils_replace_filename(idx); - document_save_file(idx, TRUE); + document_save_file_as(idx); if (! open_new_tab) build_menu_update(idx); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-03-21 13:42:31 UTC (rev 2376) +++ trunk/src/document.c 2008-03-21 14:02:59 UTC (rev 2377) @@ -1253,6 +1253,34 @@ } +/* + * Save the %document specified by @a idx, detecting the filetype. + * + * @param idx The %document index for the file to save. + * @return @c TRUE if the file was saved or @c FALSE if the file could not be saved. + * @see document_save_file(). + */ +gboolean document_save_file_as(gint idx) +{ + if (! DOC_IDX_VALID(idx)) return FALSE; + + /* detect filetype */ + if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL) + { + filetype *ft = filetypes_detect_from_file(idx); + + document_set_filetype(idx, ft); + if (document_get_cur_idx() == idx) + { + app->ignore_callback = TRUE; + filetypes_select_radio_item(doc_list[idx].file_type); + app->ignore_callback = FALSE; + } + } + return document_save_file(idx, TRUE); +} + + /** * Save the %document specified by @a idx. Saving includes replacing tabs by spaces, * stripping trailing spaces and adding a final new line at the end of the file (all only if @@ -1413,19 +1441,8 @@ * timestamp can be ahead of time(NULL) */ document_update_timestamp(idx); - if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL) - { - filetype *ft = filetypes_detect_from_file(idx); - document_set_filetype(idx, ft); - if (document_get_cur_idx() == idx) - { - app->ignore_callback = TRUE; - filetypes_select_radio_item(doc_list[idx].file_type); - app->ignore_callback = FALSE; - } - } - else - document_set_filetype(idx, doc_list[idx].file_type); + /* update filetype-related things */ + document_set_filetype(idx, doc_list[idx].file_type); tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), base_name); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-03-21 13:42:31 UTC (rev 2376) +++ trunk/src/document.h 2008-03-21 14:02:59 UTC (rev 2377) @@ -171,15 +171,19 @@ gboolean document_reload_file(gint idx, const gchar *forced_enc); + +gboolean document_save_file_as(gint idx); + gboolean document_save_file(gint idx, gboolean force); + gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); gint document_find_text(gint idx, const gchar *text, gint flags, gboolean search_backwards, - gboolean scroll, GtkWidget *parent); + gboolean scroll, GtkWidget *parent); gint document_replace_text(gint idx, const gchar *find_text, const gchar *replace_text, - gint flags, gboolean search_backwards); + gint flags, gboolean search_backwards); gboolean document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars); Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2008-03-21 13:42:31 UTC (rev 2376) +++ trunk/src/win32.c 2008-03-21 14:02:59 UTC (rev 2377) @@ -164,7 +164,7 @@ } else result = locale_filename; - + return result; } @@ -405,7 +405,7 @@ gint idx = document_get_cur_idx(); /* convert the resulting filename into UTF-8 */ doc_list[idx].file_name = g_locale_to_utf8(fname, -1, NULL, NULL, NULL); - document_save_file(idx, TRUE); + document_save_file_as(idx); } g_free(fname); return (retval != 0); @@ -665,7 +665,7 @@ { DWORD exit_code; GetExitCodeProcess(child_pid, &exit_code); - + return (exit_code == 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2376] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2376 http://geany.svn.sourceforge.net/geany/?rev=2376&view=rev Author: eht16 Date: 2008-03-21 06:42:31 -0700 (Fri, 21 Mar 2008) Log Message: ----------- When opening the manual on the website, include version string to ensure the appropriate manual version is shown. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 13:05:47 UTC (rev 2375) +++ trunk/ChangeLog 2008-03-21 13:42:31 UTC (rev 2376) @@ -1,3 +1,10 @@ +2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/callbacks.c: + When opening the manual on the website, include version string to + ensure the appropriate manual version is shown. + + 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/notebook.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-03-21 13:05:47 UTC (rev 2375) +++ trunk/src/callbacks.c 2008-03-21 13:42:31 UTC (rev 2376) @@ -1311,7 +1311,7 @@ if (! g_file_test(uri + skip, G_FILE_TEST_IS_REGULAR)) { /* fall back to online documentation if it is not found on the hard disk */ g_free(uri); - uri = g_strconcat(GEANY_HOMEPAGE, "manual/index.html", NULL); + uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); } utils_start_browser(uri); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2375] trunk
by ntrel＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2375 http://geany.svn.sourceforge.net/geany/?rev=2375&view=rev Author: ntrel Date: 2008-03-21 06:05:47 -0700 (Fri, 21 Mar 2008) Log Message: ----------- When closing tabs that were opened left-to-right, don't temporarily focus the previous tab when closing tabs, to prevent unnecessary checking for disk changes. Modified Paths: -------------- trunk/ChangeLog trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-20 17:05:45 UTC (rev 2374) +++ trunk/ChangeLog 2008-03-21 13:05:47 UTC (rev 2375) @@ -1,3 +1,11 @@ +2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/notebook.c: + When closing tabs that were opened left-to-right, don't temporarily + focus the previous tab when closing tabs, to prevent unnecessary + checking for disk changes. + + 2008-03-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * HACKING: Add note and link for GTK 2.6 API docs. Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-03-20 17:05:45 UTC (rev 2374) +++ trunk/src/notebook.c 2008-03-21 13:05:47 UTC (rev 2375) @@ -409,19 +409,18 @@ /* Always use this instead of gtk_notebook_remove_page(). */ void notebook_remove_page(gint page_num) { - gint oldpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook)); + gint curpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook)); - gtk_notebook_remove_page(GTK_NOTEBOOK(app->notebook), page_num); - - tab_count_changed(); - /* Focus the next page, not the previous */ - if (oldpage == page_num && prefs.tab_order_ltr) + if (curpage == page_num && prefs.tab_order_ltr) { - /* Unless the first tab was closed */ - if (oldpage > 0) - gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), oldpage); + gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), curpage + 1); } + + /* now remove the page (so we don't temporarily switch to the previous page) */ + gtk_notebook_remove_page(GTK_NOTEBOOK(app->notebook), page_num); + + tab_count_changed(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2374] trunk
by ntrel＠users.sourceforge.net 20 Mar '08

20 Mar '08

Revision: 2374 http://geany.svn.sourceforge.net/geany/?rev=2374&view=rev Author: ntrel Date: 2008-03-20 10:05:45 -0700 (Thu, 20 Mar 2008) Log Message: ----------- Move scroll by one line shortcuts to configurable keybindings section. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-20 16:55:14 UTC (rev 2373) +++ trunk/ChangeLog 2008-03-20 17:05:45 UTC (rev 2374) @@ -24,8 +24,9 @@ * doc/geany.txt, doc/geany.html: Update configurable keybindings section for new plugin groups ordering. - * doc/geany.txt, doc/geany.html: s/tabulator/tab/. + Move scroll by one line shortcuts to configurable keybindings + section. 2008-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-03-20 16:55:14 UTC (rev 2373) +++ trunk/doc/geany.html 2008-03-20 17:05:45 UTC (rev 2374) @@ -1862,6 +1862,14 @@ view. The cursor position and or an existing selection will not be changed.</td> </tr> +<tr><td>Scroll up by one line</td> +<td>Alt-Up</td> +<td>Scrolls the view.</td> +</tr> +<tr><td>Scroll down by one line</td> +<td>Alt-Down</td> +<td>Scrolls the view.</td> +</tr> <tr><td>Complete word</td> <td>Ctrl-Space</td> <td>Shows auto completion list.</td> @@ -1998,7 +2006,7 @@ </tr> <tr><td>Decrease indent</td> <td>Ctrl-U</td> -<td>Removes one tab or the amount fo spaces of +<td>Removes one tab or the amount of spaces of the tab width setting from the indentation of the current line or selection.</td> </tr> @@ -2895,12 +2903,6 @@ <tr><td>Extend selection to end of display line.</td> <td>Alt+Shift+End</td> </tr> -<tr><td>Scroll up.</td> -<td>Alt+Up</td> -</tr> -<tr><td>Scroll down.</td> -<td>Alt+Down</td> -</tr> <tr><td>Previous paragraph. Shift extends selection.</td> <td>Ctrl+Up</td> </tr> @@ -3511,7 +3513,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-03-20 16:56 UTC. +Generated on: 2008-03-20 17:07 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 2008-03-20 16:55:14 UTC (rev 2373) +++ trunk/doc/geany.txt 2008-03-20 17:05:45 UTC (rev 2374) @@ -1725,6 +1725,10 @@ view. The cursor position and or an existing selection will not be changed. +Scroll up by one line Alt-Up Scrolls the view. + +Scroll down by one line Alt-Down Scrolls the view. + Complete word Ctrl-Space Shows auto completion list. Show calltip Alt-Space (Unix) Shows call tips for the current function or @@ -2579,8 +2583,6 @@ 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. 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2373] trunk
by ntrel＠users.sourceforge.net 20 Mar '08

20 Mar '08

Revision: 2373 http://geany.svn.sourceforge.net/geany/?rev=2373&view=rev Author: ntrel Date: 2008-03-20 09:55:14 -0700 (Thu, 20 Mar 2008) Log Message: ----------- s/tabulator/tab/. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-20 16:50:21 UTC (rev 2372) +++ trunk/ChangeLog 2008-03-20 16:55:14 UTC (rev 2373) @@ -24,6 +24,8 @@ * doc/geany.txt, doc/geany.html: Update configurable keybindings section for new plugin groups ordering. + * doc/geany.txt, doc/geany.html: + s/tabulator/tab/. 2008-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-03-20 16:50:21 UTC (rev 2372) +++ trunk/doc/geany.html 2008-03-20 16:55:14 UTC (rev 2373) @@ -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-03-17" /> +<meta name="date" content="2008-03-20" /> <style type="text/css"> /* @@ -133,7 +133,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-03-17</td></tr> +<td>2008-03-20</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.14</td></tr> </tbody> @@ -1960,10 +1960,10 @@ </tr> <tr><td>Insert alternative whitespace</td> <td> </td> -<td>Inserts a tabulator character when spaces should +<td>Inserts a tab character when spaces should be used for indentation and inserts space -characters of the amount of a tabulator width when -tabulators should be used for indentation.</td> +characters of the amount of a tab width when +tabs should be used for indentation.</td> </tr> <tr><td><strong>Format</strong></td> <td> </td> @@ -1998,7 +1998,7 @@ </tr> <tr><td>Decrease indent</td> <td>Ctrl-U</td> -<td>Removes one tabulator or the amount fo spaces of +<td>Removes one tab or the amount fo spaces of the tab width setting from the indentation of the current line or selection.</td> </tr> @@ -3511,7 +3511,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-03-20 16:47 UTC. +Generated on: 2008-03-20 16:56 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 2008-03-20 16:50:21 UTC (rev 2372) +++ trunk/doc/geany.txt 2008-03-20 16:55:14 UTC (rev 2373) @@ -1782,10 +1782,10 @@ Insert date Shift-Alt-D Inserts a customisable date. -Insert alternative whitespace Inserts a tabulator character when spaces should +Insert alternative whitespace Inserts a tab character when spaces should be used for indentation and inserts space - characters of the amount of a tabulator width when - tabulators should be used for indentation. + characters of the amount of a tab width when + tabs should be used for indentation. **Format** @@ -1806,7 +1806,7 @@ or by spaces in the amount of the tab width setting. -Decrease indent Ctrl-U Removes one tabulator or the amount fo spaces of +Decrease indent Ctrl-U Removes one tab or the amount of spaces of the tab width setting from the indentation of the current line or selection. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2372] trunk
by ntrel＠users.sourceforge.net 20 Mar '08

20 Mar '08

Revision: 2372 http://geany.svn.sourceforge.net/geany/?rev=2372&view=rev Author: ntrel Date: 2008-03-20 09:50:21 -0700 (Thu, 20 Mar 2008) Log Message: ----------- Update configurable keybindings section for new plugin groups ordering. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-20 16:17:59 UTC (rev 2371) +++ trunk/ChangeLog 2008-03-20 16:50:21 UTC (rev 2372) @@ -21,6 +21,9 @@ * src/plugins.c: Load and save plugin keybindings when toggling plugins in the Plugin Manager. + * doc/geany.txt, doc/geany.html: + Update configurable keybindings section for new plugin groups + ordering. 2008-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-03-20 16:17:59 UTC (rev 2371) +++ trunk/doc/geany.html 2008-03-20 16:50:21 UTC (rev 2372) @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> +<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-03-17" /> @@ -1790,7 +1790,7 @@ </tr> </thead> <tbody valign="top"> -<tr><td><strong>File menu</strong></td> +<tr><td><strong>File</strong></td> <td> </td> <td> </td> </tr> @@ -1831,7 +1831,7 @@ <td>Ctrl-P</td> <td>Prints the current file.</td> </tr> -<tr><td><strong>Edit menu</strong></td> +<tr><td><strong>Editor</strong></td> <td> </td> <td> </td> </tr> @@ -1843,6 +1843,68 @@ <td>Ctrl-Y</td> <td>Re-does the last action.</td> </tr> +<tr><td>Delete current line(s)</td> +<td>Ctrl-K</td> +<td>Deletes the current line (and any lines with a +selection).</td> +</tr> +<tr><td>Duplicate line or selection</td> +<td>Ctrl-D</td> +<td>Duplicates the current line or selection.</td> +</tr> +<tr><td>Transpose current line</td> +<td>Ctrl-T</td> +<td>Transposes the current line with the previous one.</td> +</tr> +<tr><td>Scroll to current line</td> +<td>Ctrl-Shift-L</td> +<td>Scrolls the current line into the centre of the +view. The cursor position and or an existing +selection will not be changed.</td> +</tr> +<tr><td>Complete word</td> +<td>Ctrl-Space</td> +<td>Shows auto completion list.</td> +</tr> +<tr><td>Show calltip</td> +<td>Alt-Space (Unix) +Alt-Shift-Space (Windows)</td> +<td>Shows call tips for the current function or +method.</td> +</tr> +<tr><td>Show macro list</td> +<td>Ctrl-Return</td> +<td>Shows a list of available macros and variables in +the workspace.</td> +</tr> +<tr><td>Complete snippet</td> +<td>Tab</td> +<td>If you type a construct like if or for and press +this key, it will be completed with a matching +template.</td> +</tr> +<tr><td>Suppress snippet completion</td> +<td> </td> +<td>If you type a construct like if or for and press +this key, it will not be completed, and a space or +tab will be inserted, depending on what the +construct completion keybinding is set to. For +example, if you have set the construct completion +keybinding to space, then setting this to +Shift+space will prevent construct completion and +insert a space.</td> +</tr> +<tr><td>Context Action</td> +<td> </td> +<td>Executes a command and passes the current word +(near the cursor postion) or selection as an +argument. See the section called <a class="reference" href="#context-actions">Context +actions</a>.</td> +</tr> +<tr><td><strong>Clipboard</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Cut</td> <td>Ctrl-X</td> <td>Cut the current selection to the clipboard.</td> @@ -1855,20 +1917,115 @@ <td>Ctrl-V</td> <td>Paste the clipboard text into the current document.</td> </tr> +<tr><td>Cut current line(s)</td> +<td>Ctrl-Shift-X</td> +<td>Cuts the current line (and any lines with a +selection) to the clipboard.</td> +</tr> +<tr><td>Copy current line(s)</td> +<td>Ctrl-Shift-C</td> +<td>Copies the current line (and any lines with a +selection) to the clipboard.</td> +</tr> +<tr><td><strong>Select</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Select all</td> <td>Ctrl-A</td> <td>Makes a selection of all text in the current document.</td> </tr> +<tr><td>Select current word</td> +<td>Alt-Shift-W</td> +<td>Selects the current word under the cursor.</td> +</tr> +<tr><td>Select current paragraph</td> +<td>Alt-Shift-P</td> +<td>Selects the current paragraph under the cursor +which is defined by two empty lines around it.</td> +</tr> +<tr><td>Select current line(s)</td> +<td>Alt-Shift-L</td> +<td>Selects the current line under the cursor (and any +partially selected lines).</td> +</tr> +<tr><td><strong>Insert</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Insert date</td> <td>Shift-Alt-D</td> <td>Inserts a customisable date.</td> </tr> +<tr><td>Insert alternative whitespace</td> +<td> </td> +<td>Inserts a tabulator character when spaces should +be used for indentation and inserts space +characters of the amount of a tabulator width when +tabulators should be used for indentation.</td> +</tr> +<tr><td><strong>Format</strong></td> +<td> </td> +<td> </td> +</tr> +<tr><td>Toggle case of selection</td> +<td>Ctrl-Alt-U</td> +<td>Changes the case of the selection. A lowercase +selection will be changed into uppercase and vice +versa. If the selection contains lower- and +uppercase characters, all will be converted to +lowercase.</td> +</tr> +<tr><td>Comment line</td> +<td> </td> +<td>Comments current line or selection.</td> +</tr> +<tr><td>Uncomment line</td> +<td> </td> +<td>Uncomments current line or selection.</td> +</tr> +<tr><td>Toggle line commentation</td> +<td>Ctrl-E</td> +<td>Comments a line if it is not commented or removes +a comment if the line is commented.</td> +</tr> +<tr><td>Increase indent</td> +<td>Ctrl-I</td> +<td>Indents the current line or selection by one tab +or by spaces in the amount of the tab width +setting.</td> +</tr> +<tr><td>Decrease indent</td> +<td>Ctrl-U</td> +<td>Removes one tabulator or the amount fo spaces of +the tab width setting from the indentation of the +current line or selection.</td> +</tr> +<tr><td>Increase indent by one space</td> +<td> </td> +<td>Indents the current line or selection by one +space.</td> +</tr> +<tr><td>Decrease indent by one space</td> +<td> </td> +<td>Deindents the current line or selection by one +space.</td> +</tr> +<tr><td>Smart line indent</td> +<td> </td> +<td>Indents the current line or all selected lines +with the same intentation as the previous line.</td> +</tr> +<tr><td><strong>Settings</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Preferences</td> <td>Ctrl-Alt-P</td> <td>Opens preferences dialog.</td> </tr> -<tr><td><strong>Search menu</strong></td> +<tr><td><strong>Search</strong></td> <td> </td> <td> </td> </tr> @@ -1897,14 +2054,72 @@ <td>Jumps to the line with the next message from the last call to Find usage.</td> </tr> +<tr><td>Find Usage</td> +<td> </td> +<td>Finds all occurrences of the current word (near +the keyboard cursor) or selection and displays +them in the messages window.</td> +</tr> +<tr><td><strong>Go to</strong></td> +<td> </td> +<td> </td> +</tr> +<tr><td>Navigate forward a location</td> +<td> </td> +<td>Switches to the next location in the navigation +history. See the section called <a class="reference" href="#code-navigation-history">Code Navigation +History</a>.</td> +</tr> +<tr><td>Navigate back a location</td> +<td> </td> +<td>Switches to the previous location in the +navigation history. See the section called +<a class="reference" href="#code-navigation-history">Code Navigation History</a>.</td> +</tr> <tr><td>Go to line</td> <td>Ctrl-L</td> <td>Opens the Go to line dialog.</td> </tr> -<tr><td><strong>View menu</strong></td> +<tr><td>Goto matching brace</td> +<td>Ctrl-B</td> +<td>If the cursor is ahead or behind a brace, then it +is moved to the brace which belongs to the current +one. If this keyboard shortcut is pressed again, +the cursor is moved back to the first brace.</td> +</tr> +<tr><td>Toggle marker</td> +<td>Ctrl-M</td> +<td>Set a marker on the current line, or clear the +marker if there already is one.</td> +</tr> +<tr><td>Goto next marker</td> +<td>Ctrl-.</td> +<td>Goto the next marker in the current document.</td> +</tr> +<tr><td>Goto previous marker</td> +<td>Ctrl-,</td> +<td>Goto the previous marker in the current document.</td> +</tr> +<tr><td>Go to tag definition</td> <td> </td> +<td>Jump to the definition of the current word (near +the keyboard cursor). If the definition cannot be +found (e.g. the relevant file is not open) Geany +will beep and do nothing. See the section called +<a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</td> +</tr> +<tr><td>Go to tag declaration</td> <td> </td> +<td>Jump to the declaration of the current word (near +the keyboard cursor). If the declaration cannot be +found (e.g. the relevant file is not open) Geany +will beep and do nothing. See the section called +<a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a>.</td> </tr> +<tr><td><strong>View</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Fullscreen</td> <td>F11</td> <td>Switches to fullscreen mode.</td> @@ -1924,10 +2139,6 @@ notebook tabs, the toolbar, the messages window and the statusbar.</td> </tr> -<tr><td><strong>Document menu</strong></td> -<td> </td> -<td> </td> -</tr> <tr><td>Zoom In</td> <td>Ctrl-+</td> <td>Zooms in the text</td> @@ -1936,85 +2147,10 @@ <td>Ctrl--</td> <td>Zooms out the text</td> </tr> -<tr><td>Replace tabs by space</td> +<tr><td><strong>Focus</strong></td> <td> </td> -<td>Replaces all tabs with the right amount of spaces.</td> -</tr> -<tr><td>Fold all</td> <td> </td> -<td>Folds all contractible code blocks.</td> </tr> -<tr><td>Unfold all</td> -<td> </td> -<td>Unfolds all contracted code blocks.</td> -</tr> -<tr><td><strong>Build menu</strong></td> -<td> </td> -<td> </td> -</tr> -<tr><td>Compile</td> -<td>F8</td> -<td>Compiles the current file.</td> -</tr> -<tr><td>Build</td> -<td>F9</td> -<td>Builds (compiles if necessary and links) the -current file.</td> -</tr> -<tr><td>Make all</td> -<td>Shift-F9</td> -<td>Builds the current file with the Make tool.</td> -</tr> -<tr><td>Make custom target</td> -<td>Ctrl-Shift-F9</td> -<td>Builds the current file with the Make tool and a -given target.</td> -</tr> -<tr><td>Make object</td> -<td> </td> -<td>Compiles the current file with the Make tool.</td> -</tr> -<tr><td>Next error</td> -<td> </td> -<td>Jumps to the line with the next error from the -last build process.</td> -</tr> -<tr><td>Run</td> -<td>F5</td> -<td>Executes the current file in a terminal emulation.</td> -</tr> -<tr><td>Run (alternative command)</td> -<td> </td> -<td>Executes the current file in a terminal emulation.</td> -</tr> -<tr><td>Build options</td> -<td> </td> -<td>Opens the build options dialog.</td> -</tr> -<tr><td><strong>Tools menu</strong></td> -<td> </td> -<td> </td> -</tr> -<tr><td>Show Color Chooser</td> -<td> </td> -<td>Opens the Colour Chooser dialog.</td> -</tr> -<tr><td><strong>Help menu</strong></td> -<td> </td> -<td> </td> -</tr> -<tr><td>Help</td> -<td>F1</td> -<td>Opens the manual.</td> -</tr> -<tr><td><strong>Miscellaneous</strong></td> -<td> </td> -<td> </td> -</tr> -<tr><td>Reload symbol list</td> -<td>Ctrl-Shift-R</td> -<td>Reloads the tag/symbol list.</td> -</tr> <tr><td>Switch to Editor</td> <td>F2</td> <td>Switches to editor widget.</td> @@ -2032,6 +2168,10 @@ <td>Switches to the search bar in the toolbar (if visible).</td> </tr> +<tr><td><strong>Notebook tabs</strong></td> +<td> </td> +<td> </td> +</tr> <tr><td>Switch to left document</td> <td>Ctrl-PageUp</td> <td>Switches to the previous open document.</td> @@ -2062,204 +2202,84 @@ <td> </td> <td>Moves the current document to the last position.</td> </tr> -<tr><td>Navigate forward a location</td> +<tr><td><strong>Document</strong></td> <td> </td> -<td>Switches to the next location in the navigation -history. See the section called <a class="reference" href="#code-navigation-history">Code Navigation -History</a>.</td> +<td> </td> </tr> -<tr><td>Navigate back a location</td> +<tr><td>Replace tabs by space</td> <td> </td> -<td>Switches to the previous location in the -navigation history. See the section called -<a class="reference" href="#code-navigation-history">Code Navigation History</a>.</td> +<td>Replaces all tabs with the right amount of spaces.</td> </tr> -<tr><td><strong>Editing operations</strong></td> +<tr><td>Fold all</td> <td> </td> +<td>Folds all contractible code blocks.</td> +</tr> +<tr><td>Unfold all</td> <td> </td> +<td>Unfolds all contracted code blocks.</td> </tr> -<tr><td>Toggle case of selection</td> -<td>Ctrl-Alt-U</td> -<td>Changes the case of the selection. A lowercase -selection will be changed into uppercase and vice -versa. If the selection contains lower- and -uppercase characters, all will be converted to -lowercase.</td> +<tr><td>Reload symbol list</td> +<td>Ctrl-Shift-R</td> +<td>Reloads the tag/symbol list.</td> </tr> -<tr><td>Duplicate line or selection</td> -<td>Ctrl-D</td> -<td>Duplicates the current line or selection.</td> -</tr> -<tr><td>Delete current line(s)</td> -<td>Ctrl-K</td> -<td>Deletes the current line (and any lines with a -selection).</td> -</tr> -<tr><td>Cut current line(s)</td> -<td>Ctrl-Shift-X</td> -<td>Cuts the current line (and any lines with a -selection) to the clipboard.</td> -</tr> -<tr><td>Copy current line(s)</td> -<td>Ctrl-Shift-C</td> -<td>Copies the current line (and any lines with a -selection) to the clipboard.</td> -</tr> -<tr><td>Transpose current line</td> -<td>Ctrl-T</td> -<td>Transposes the current line with the previous one.</td> -</tr> -<tr><td>Comment line</td> +<tr><td><strong>Build</strong></td> <td> </td> -<td>Comments current line or selection.</td> -</tr> -<tr><td>Uncomment line</td> <td> </td> -<td>Uncomments current line or selection.</td> </tr> -<tr><td>Toggle line commentation</td> -<td>Ctrl-E</td> -<td>Comments a line if it is not commented or removes -a comment if the line is commented.</td> +<tr><td>Compile</td> +<td>F8</td> +<td>Compiles the current file.</td> </tr> -<tr><td>Increase indent</td> -<td>Ctrl-I</td> -<td>Indents the current line or selection by one tab -or by spaces in the amount of the tab width -setting.</td> +<tr><td>Build</td> +<td>F9</td> +<td>Builds (compiles if necessary and links) the +current file.</td> </tr> -<tr><td>Decrease indent</td> -<td>Ctrl-U</td> -<td>Removes one tabulator or the amount fo spaces of -the tab width setting from the indentation of the -current line or selection.</td> +<tr><td>Make all</td> +<td>Shift-F9</td> +<td>Builds the current file with the Make tool.</td> </tr> -<tr><td>Increase indent by one space</td> -<td> </td> -<td>Indents the current line or selection by one -space.</td> +<tr><td>Make custom target</td> +<td>Ctrl-Shift-F9</td> +<td>Builds the current file with the Make tool and a +given target.</td> </tr> -<tr><td>Decrease indent by one space</td> +<tr><td>Make object</td> <td> </td> -<td>Deindents the current line or selection by one -space.</td> +<td>Compiles the current file with the Make tool.</td> </tr> -<tr><td>Smart line indent</td> +<tr><td>Next error</td> <td> </td> -<td>Indents the current line or all selected lines -with the same intentation as the previous line.</td> +<td>Jumps to the line with the next error from the +last build process.</td> </tr> -<tr><td>Goto matching brace</td> -<td>Ctrl-B</td> -<td>If the cursor is ahead or behind a brace, then it -is moved to the brace which belongs to the current -one. If this keyboard shortcut is pressed again, -the cursor is moved back to the first brace.</td> +<tr><td>Run</td> +<td>F5</td> +<td>Executes the current file in a terminal emulation.</td> </tr> -<tr><td>Toggle marker</td> -<td>Ctrl-M</td> -<td>Set a marker on the current line, or clear the -marker if there already is one.</td> -</tr> -<tr><td>Goto next marker</td> -<td>Ctrl-.</td> -<td>Goto the next marker in the current document.</td> -</tr> -<tr><td>Goto previous marker</td> -<td>Ctrl-,</td> -<td>Goto the previous marker in the current document.</td> -</tr> -<tr><td>Complete word</td> -<td>Ctrl-Space</td> -<td>Shows auto completion list.</td> -</tr> -<tr><td>Show calltip</td> -<td>Alt-Space (Unix) -Alt-Shift-Space (Windows)</td> -<td>Shows call tips for the current function or -method.</td> -</tr> -<tr><td>Show macro list</td> -<td>Ctrl-Return</td> -<td>Shows a list of available macros and variables in -the workspace.</td> -</tr> -<tr><td>Complete snippet</td> -<td>Tab</td> -<td>If you type a construct like if or for and press -this key, it will be completed with a matching -template.</td> -</tr> -<tr><td>Suppress snippet completion</td> +<tr><td>Run (alternative command)</td> <td> </td> -<td>If you type a construct like if or for and press -this key, it will not be completed, and a space or -tab will be inserted, depending on what the -construct completion keybinding is set to. For -example, if you have set the construct completion -keybinding to space, then setting this to -Shift+space will prevent construct completion and -insert a space.</td> +<td>Executes the current file in a terminal emulation.</td> </tr> -<tr><td>Select current word</td> -<td>Alt-Shift-W</td> -<td>Selects the current word under the cursor.</td> -</tr> -<tr><td>Select current paragraph</td> -<td>Alt-Shift-P</td> -<td>Selects the current paragraph under the cursor -which is defined by two empty lines around it.</td> -</tr> -<tr><td>Select current line(s)</td> -<td>Alt-Shift-L</td> -<td>Selects the current line under the cursor (and any -partially selected lines).</td> -</tr> -<tr><td>Scroll to current line</td> -<td>Ctrl-Shift-L</td> -<td>Scrolls the current line into the centre of the -view. The cursor position and or an existing -selection will not be changed.</td> -</tr> -<tr><td>Insert alternative whitespace</td> +<tr><td>Build options</td> <td> </td> -<td>Inserts a tabulator character when spaces should -be used for indentation and inserts space -characters of the amount of a tabulator width when -tabulators should be used for indentation.</td> +<td>Opens the build options dialog.</td> </tr> -<tr><td><strong>Popup menu</strong></td> +<tr><td><strong>Tools</strong></td> <td> </td> <td> </td> </tr> -<tr><td>Find Usage</td> +<tr><td>Show Color Chooser</td> <td> </td> -<td>Finds all occurrences of the current word (near -the keyboard cursor) or selection and displays -them in the messages window.</td> +<td>Opens the Colour Chooser dialog.</td> </tr> -<tr><td>Go to tag definition</td> +<tr><td><strong>Help</strong></td> <td> </td> -<td>Jump to the definition of the current word (near -the keyboard cursor). If the definition cannot be -found (e.g. the relevant file is not open) Geany -will beep and do nothing. See the section called -<a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</td> -</tr> -<tr><td>Go to tag declaration</td> <td> </td> -<td>Jump to the declaration of the current word (near -the keyboard cursor). If the declaration cannot be -found (e.g. the relevant file is not open) Geany -will beep and do nothing. See the section called -<a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a>.</td> </tr> -<tr><td>Context Action</td> -<td> </td> -<td>Executes a command and passes the current word -(near the cursor postion) or selection as an -argument. See the section called <a class="reference" href="#context-actions">Context -actions</a>.</td> +<tr><td>Help</td> +<td>F1</td> +<td>Opens the manual.</td> </tr> </tbody> </table> @@ -3491,7 +3511,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-03-17 13:43 UTC. +Generated on: 2008-03-20 16:47 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 2008-03-20 16:17:59 UTC (rev 2371) +++ trunk/doc/geany.txt 2008-03-20 16:50:21 UTC (rev 2372) @@ -1688,7 +1688,7 @@ =============================== ========================= ========================================= Action Default shortcut Description =============================== ========================= ========================================= -**File menu** +**File** New Ctrl-N Creates a new file. @@ -1709,102 +1709,194 @@ Print Ctrl-P Prints the current file. -**Edit menu** +**Editor** Undo Ctrl-Z Un-does the last action. Redo Ctrl-Y Re-does the last action. +Delete current line(s) Ctrl-K Deletes the current line (and any lines with a + selection). +Duplicate line or selection Ctrl-D Duplicates the current line or selection. + +Transpose current line Ctrl-T Transposes the current line with the previous one. + +Scroll to current line Ctrl-Shift-L Scrolls the current line into the centre of the + view. The cursor position and or an existing + selection will not be changed. + +Complete word Ctrl-Space Shows auto completion list. + +Show calltip Alt-Space (Unix) Shows call tips for the current function or + Alt-Shift-Space (Windows) method. + +Show macro list Ctrl-Return Shows a list of available macros and variables in + the workspace. + +Complete snippet Tab If you type a construct like if or for and press + this key, it will be completed with a matching + template. + +Suppress snippet completion If you type a construct like if or for and press + this key, it will not be completed, and a space or + tab will be inserted, depending on what the + construct completion keybinding is set to. For + example, if you have set the construct completion + keybinding to space, then setting this to + Shift+space will prevent construct completion and + insert a space. + +Context Action Executes a command and passes the current word + (near the cursor postion) or selection as an + argument. See the section called `Context + actions`_. + +**Clipboard** + Cut Ctrl-X Cut the current selection to the clipboard. Copy Ctrl-C Copy the current selection to the clipboard. Paste Ctrl-V Paste the clipboard text into the current document. +Cut current line(s) Ctrl-Shift-X Cuts the current line (and any lines with a + selection) to the clipboard. + +Copy current line(s) Ctrl-Shift-C Copies the current line (and any lines with a + selection) to the clipboard. + +**Select** + Select all Ctrl-A Makes a selection of all text in the current document. +Select current word Alt-Shift-W Selects the current word under the cursor. + +Select current paragraph Alt-Shift-P Selects the current paragraph under the cursor + which is defined by two empty lines around it. + +Select current line(s) Alt-Shift-L Selects the current line under the cursor (and any + partially selected lines). + +**Insert** + Insert date Shift-Alt-D Inserts a customisable date. -Preferences Ctrl-Alt-P Opens preferences dialog. +Insert alternative whitespace Inserts a tabulator character when spaces should + be used for indentation and inserts space + characters of the amount of a tabulator width when + tabulators should be used for indentation. -**Search menu** +**Format** -Find Ctrl-F Opens the Find dialog. +Toggle case of selection Ctrl-Alt-U Changes the case of the selection. A lowercase + selection will be changed into uppercase and vice + versa. If the selection contains lower- and + uppercase characters, all will be converted to + lowercase. -Find Next Ctrl-G Finds next result. +Comment line Comments current line or selection. -Find Previous Ctrl-Shift-G Finds previous result. +Uncomment line Uncomments current line or selection. -Replace Ctrl-H Opens the Replace dialog. +Toggle line commentation Ctrl-E Comments a line if it is not commented or removes + a comment if the line is commented. -Find in files Ctrl-Shift-F Opens the Find in files dialog. +Increase indent Ctrl-I Indents the current line or selection by one tab + or by spaces in the amount of the tab width + setting. -Next message Jumps to the line with the next message from - the last call to Find usage. +Decrease indent Ctrl-U Removes one tabulator or the amount fo spaces of + the tab width setting from the indentation of the + current line or selection. -Go to line Ctrl-L Opens the Go to line dialog. +Increase indent by one space Indents the current line or selection by one + space. -**View menu** +Decrease indent by one space Deindents the current line or selection by one + space. -Fullscreen F11 Switches to fullscreen mode. +Smart line indent Indents the current line or all selected lines + with the same intentation as the previous line. -Toggle Messages Window Toggles the message window (status and compiler - messages) on and off. +**Settings** -Toggle Sidebar Shows or hides the sidebar. +Preferences Ctrl-Alt-P Opens preferences dialog. -Toggle all additional widgets Hide and show all additional widgets like the - notebook tabs, the toolbar, the messages window - and the statusbar. +**Search** -**Document menu** +Find Ctrl-F Opens the Find dialog. -Zoom In Ctrl-+ Zooms in the text +Find Next Ctrl-G Finds next result. -Zoom Out Ctrl-- Zooms out the text +Find Previous Ctrl-Shift-G Finds previous result. -Replace tabs by space Replaces all tabs with the right amount of spaces. +Replace Ctrl-H Opens the Replace dialog. -Fold all Folds all contractible code blocks. +Find in files Ctrl-Shift-F Opens the Find in files dialog. -Unfold all Unfolds all contracted code blocks. +Next message Jumps to the line with the next message from + the last call to Find usage. -**Build menu** +Find Usage Finds all occurrences of the current word (near + the keyboard cursor) or selection and displays + them in the messages window. -Compile F8 Compiles the current file. +**Go to** -Build F9 Builds (compiles if necessary and links) the - current file. +Navigate forward a location Switches to the next location in the navigation + history. See the section called `Code Navigation + History`_. -Make all Shift-F9 Builds the current file with the Make tool. +Navigate back a location Switches to the previous location in the + navigation history. See the section called + `Code Navigation History`_. -Make custom target Ctrl-Shift-F9 Builds the current file with the Make tool and a - given target. +Go to line Ctrl-L Opens the Go to line dialog. -Make object Compiles the current file with the Make tool. +Goto matching brace Ctrl-B If the cursor is ahead or behind a brace, then it + is moved to the brace which belongs to the current + one. If this keyboard shortcut is pressed again, + the cursor is moved back to the first brace. -Next error Jumps to the line with the next error from the - last build process. +Toggle marker Ctrl-M Set a marker on the current line, or clear the + marker if there already is one. -Run F5 Executes the current file in a terminal emulation. +Goto next marker Ctrl-. Goto the next marker in the current document. -Run (alternative command) Executes the current file in a terminal emulation. +Goto previous marker Ctrl-, Goto the previous marker in the current document. -Build options Opens the build options dialog. +Go to tag definition Jump to the definition of the current word (near + the keyboard cursor). If the definition cannot be + found (e.g. the relevant file is not open) Geany + will beep and do nothing. See the section called + `Go to tag definition`_. -**Tools menu** +Go to tag declaration Jump to the declaration of the current word (near + the keyboard cursor). If the declaration cannot be + found (e.g. the relevant file is not open) Geany + will beep and do nothing. See the section called + `Go to tag declaration`_. -Show Color Chooser Opens the Colour Chooser dialog. +**View** -**Help menu** +Fullscreen F11 Switches to fullscreen mode. -Help F1 Opens the manual. +Toggle Messages Window Toggles the message window (status and compiler + messages) on and off. -**Miscellaneous** +Toggle Sidebar Shows or hides the sidebar. -Reload symbol list Ctrl-Shift-R Reloads the tag/symbol list. +Toggle all additional widgets Hide and show all additional widgets like the + notebook tabs, the toolbar, the messages window + and the statusbar. +Zoom In Ctrl-+ Zooms in the text + +Zoom Out Ctrl-- Zooms out the text + +**Focus** + Switch to Editor F2 Switches to editor widget. Switch to Scribble F6 Switches to scribble widget. @@ -1814,6 +1906,8 @@ Switch to Search Bar F7 Switches to the search bar in the toolbar (if visible). +**Notebook tabs** + Switch to left document Ctrl-PageUp Switches to the previous open document. Switch to right document Ctrl-PageDown Switches to the next open document. @@ -1830,131 +1924,46 @@ Move document last Moves the current document to the last position. -Navigate forward a location Switches to the next location in the navigation - history. See the section called `Code Navigation - History`_. +**Document** -Navigate back a location Switches to the previous location in the - navigation history. See the section called - `Code Navigation History`_. +Replace tabs by space Replaces all tabs with the right amount of spaces. -**Editing operations** +Fold all Folds all contractible code blocks. -Toggle case of selection Ctrl-Alt-U Changes the case of the selection. A lowercase - selection will be changed into uppercase and vice - versa. If the selection contains lower- and - uppercase characters, all will be converted to - lowercase. +Unfold all Unfolds all contracted code blocks. -Duplicate line or selection Ctrl-D Duplicates the current line or selection. +Reload symbol list Ctrl-Shift-R Reloads the tag/symbol list. -Delete current line(s) Ctrl-K Deletes the current line (and any lines with a - selection). +**Build** -Cut current line(s) Ctrl-Shift-X Cuts the current line (and any lines with a - selection) to the clipboard. +Compile F8 Compiles the current file. -Copy current line(s) Ctrl-Shift-C Copies the current line (and any lines with a - selection) to the clipboard. +Build F9 Builds (compiles if necessary and links) the + current file. -Transpose current line Ctrl-T Transposes the current line with the previous one. +Make all Shift-F9 Builds the current file with the Make tool. -Comment line Comments current line or selection. +Make custom target Ctrl-Shift-F9 Builds the current file with the Make tool and a + given target. -Uncomment line Uncomments current line or selection. +Make object Compiles the current file with the Make tool. -Toggle line commentation Ctrl-E Comments a line if it is not commented or removes - a comment if the line is commented. +Next error Jumps to the line with the next error from the + last build process. -Increase indent Ctrl-I Indents the current line or selection by one tab - or by spaces in the amount of the tab width - setting. +Run F5 Executes the current file in a terminal emulation. -Decrease indent Ctrl-U Removes one tabulator or the amount fo spaces of - the tab width setting from the indentation of the - current line or selection. +Run (alternative command) Executes the current file in a terminal emulation. -Increase indent by one space Indents the current line or selection by one - space. +Build options Opens the build options dialog. -Decrease indent by one space Deindents the current line or selection by one - space. +**Tools** -Smart line indent Indents the current line or all selected lines - with the same intentation as the previous line. +Show Color Chooser Opens the Colour Chooser dialog. -Goto matching brace Ctrl-B If the cursor is ahead or behind a brace, then it - is moved to the brace which belongs to the current - one. If this keyboard shortcut is pressed again, - the cursor is moved back to the first brace. +**Help** -Toggle marker Ctrl-M Set a marker on the current line, or clear the - marker if there already is one. - -Goto next marker Ctrl-. Goto the next marker in the current document. - -Goto previous marker Ctrl-, Goto the previous marker in the current document. - -Complete word Ctrl-Space Shows auto completion list. - -Show calltip Alt-Space (Unix) Shows call tips for the current function or - Alt-Shift-Space (Windows) method. - -Show macro list Ctrl-Return Shows a list of available macros and variables in - the workspace. - -Complete snippet Tab If you type a construct like if or for and press - this key, it will be completed with a matching - template. - -Suppress snippet completion If you type a construct like if or for and press - this key, it will not be completed, and a space or - tab will be inserted, depending on what the - construct completion keybinding is set to. For - example, if you have set the construct completion - keybinding to space, then setting this to - Shift+space will prevent construct completion and - insert a space. - -Select current word Alt-Shift-W Selects the current word under the cursor. - -Select current paragraph Alt-Shift-P Selects the current paragraph under the cursor - which is defined by two empty lines around it. - -Select current line(s) Alt-Shift-L Selects the current line under the cursor (and any - partially selected lines). - -Scroll to current line Ctrl-Shift-L Scrolls the current line into the centre of the - view. The cursor position and or an existing - selection will not be changed. - -Insert alternative whitespace Inserts a tabulator character when spaces should - be used for indentation and inserts space - characters of the amount of a tabulator width when - tabulators should be used for indentation. - -**Popup menu** - -Find Usage Finds all occurrences of the current word (near - the keyboard cursor) or selection and displays - them in the messages window. - -Go to tag definition Jump to the definition of the current word (near - the keyboard cursor). If the definition cannot be - found (e.g. the relevant file is not open) Geany - will beep and do nothing. See the section called - `Go to tag definition`_. - -Go to tag declaration Jump to the declaration of the current word (near - the keyboard cursor). If the declaration cannot be - found (e.g. the relevant file is not open) Geany - will beep and do nothing. See the section called - `Go to tag declaration`_. - -Context Action Executes a command and passes the current word - (near the cursor postion) or selection as an - argument. See the section called `Context - actions`_. +Help F1 Opens the manual. =============================== ========================= ========================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008