Commits May 2011

commits@lists.geany.org

5 participants
73 discussions

SF.net SVN: geany:[5807] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5807 http://geany.svn.sourceforge.net/geany/?rev=5807&view=rev Author: statc Date: 2011-05-21 08:54:44 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5661..5680) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/TODO branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/geany.glade branches/sm/plugins/filebrowser.c branches/sm/po/ChangeLog branches/sm/po/de.po branches/sm/src/build.c branches/sm/src/dialogs.c branches/sm/src/encodings.c branches/sm/src/interface.c branches/sm/src/interface.h branches/sm/src/main.c branches/sm/src/prefs.c branches/sm/src/templates.c branches/sm/src/templates.h branches/sm/src/toolbar.c branches/sm/src/tools.c Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:53:29 UTC (rev 5806) +++ branches/sm/ChangeLog 2011-05-21 08:54:44 UTC (rev 5807) @@ -1,3 +1,58 @@ +2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> + + * src/main.c, src/prefs.c, src/tools.c: + Fix loading and updating menu accelerators for custom commands. + + +2011-04-02 Colomban Wendling <colomban(at)geany(dot)org> + + * src/tools.c, doc/geany.txt, doc/geany.html: + Improve the `Set Custom Commands` dialog. + + +2011-04-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/interface.h, geany.glade: + Rename Preferences dialog Interface subtab More -> Notebook tabs. + * src/toolbar.c, src/dialogs.c: + Use mimetype icon in File Properties dialog. + * doc/geany.txt, doc/geany.html: + Fix title capitalization. + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Move Preferences dialog Toolbar tab under Interface tab. + * src/build.c: + Tweak some build dialog labels: + Clear -> Reset. + Fix capitalization. + Use filetype name instead of title. + * src/templates.c, src/templates.h, doc/geany.txt, doc/geany.html: + Remove old filetype templates support - users can use custom file + templates instead. + + +2011-04-01 Colomban Wendling <colomban(at)geany(dot)org> + + * src/encodings.c: + Update regex used to find encodings for it to allow the encoding to + be quoted, adding support for XML (closes #3183506). + * src/encodings.c: + Implement charset name normalization in order to better deal with + badly-written encoding names (i.e. names found by regex search). + This also makes encodings_get_idx_from_charset() and + encodings_get_from_charset() more permissive regarding the passed-in + encoding name. + * src/encodings.c: + Always try to honor the charset found in the document, even if the + document can be loaded as UTF-8. + This make files encoded with e.g. ISO-8859-1 that have the proper + information in them but only use the UTF-8 compatible part of + ISO-8859-1 to be properly loaded as ISO-8859-1, rather than UTF-8. + Also fix check for locale encoding. + * src/tools.c, doc/geany.txt, doc/geany.html: + Make `Send selection to` send the current line if there is no + selection. + + 2011-03-31 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/filebrowser.c: @@ -3,4 +58,13 @@ Make 'Hide object files' preference configurable with file extensions. + * plugins/filebrowser.c: + Fix applying default setting for hide_object_files (oops). + Fix warning when enabling plugin from the Plugin Manager. + * plugins/filebrowser.c: + Fix optimization for filter check when pattern is '*'. + Use foreach_strv() instead of foreach_c_array(). + * plugins/filebrowser.c: + Don't hide directories matching hidden file extensions e.g. foo.o. + Refactor with check_object(). @@ -17,7 +81,7 @@ * plugins/saveactions.c: Fix Instant Save preferences combo box filetype order. * plugins/filebrowser.c: - Remove confusing macro CHECK_READ_SETTING(). + Remove macro CHECK_READ_SETTING(). 2011-03-30 Colomban Wendling <colomban(at)geany(dot)org> Modified: branches/sm/TODO =================================================================== --- branches/sm/TODO 2011-05-21 08:53:29 UTC (rev 5806) +++ branches/sm/TODO 2011-05-21 08:54:44 UTC (rev 5807) @@ -15,12 +15,12 @@ programming languages (done for C-like filetypes using filetypes.common named styles) o update included regex library (and other CTags improvements) + o filetype-independent run command & keybinding o (better custom filetype support) o (custom template insertion - so user can add licenses, etc) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) o (sci macro support - as a plugin?) - o (parsing tags from a memory buffer instead of a file on disk) o (tango-like icons for the symbol list) o (per-workspace instances with socket support - see workspace-sockets branch) @@ -36,10 +36,10 @@ -------- Note: these items might not get worked on. - o (calltip support for non-C-like languages that use + o (calltip support for more non-C-like languages that use function_name(arguments) syntax - see python.c:parseArglist()) o (better tags support for popular languages? - this is a moving target...) - o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) + o (support for adding syntax highlighting dynamically?) o Some kind of support for CTags tags files o Python plugin interface (different concept from Lua scripting) Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:53:29 UTC (rev 5806) +++ branches/sm/doc/geany.html 2011-05-21 08:54:44 UTC (rev 5807) @@ -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="2011-03-29" /> +<meta name="date" content="2011-04-01" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2011-03-29</td></tr> +<td>2011-04-01</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.21</td></tr> </tbody> @@ -166,8 +166,8 @@ <li><a class="reference" href="#source-compilation" id="id15" name="id15">Source compilation</a><ul> <li><a class="reference" href="#autotools-based-build-system" id="id16" name="id16">Autotools based build system</a></li> <li><a class="reference" href="#waf-based-build-system" id="id17" name="id17">Waf based build system</a><ul> -<li><a class="reference" href="#waf-cache" id="id18" name="id18">Waf Cache</a><ul> -<li><a class="reference" href="#cleaning-the-cache" id="id19" name="id19">Cleaning the Cache</a></li> +<li><a class="reference" href="#waf-cache" id="id18" name="id18">Waf cache</a><ul> +<li><a class="reference" href="#cleaning-the-cache" id="id19" name="id19">Cleaning the cache</a></li> </ul> </li> </ul> @@ -267,7 +267,7 @@ <li><a class="reference" href="#generating-a-global-tags-file" id="id82" name="id82">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#c-ignore-tags" id="id83" name="id83">C Ignore tags</a></li> +<li><a class="reference" href="#c-ignore-tags" id="id83" name="id83">C ignore.tags</a></li> </ul> </li> <li><a class="reference" href="#preferences" id="id84" name="id84">Preferences</a><ul> @@ -286,174 +286,176 @@ <li><a class="reference" href="#interface-preferences" id="id93" name="id93">Interface preferences</a><ul> <li><a class="reference" href="#sidebar" id="id94" name="id94">Sidebar</a></li> <li><a class="reference" href="#fonts" id="id95" name="id95">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id96" name="id96">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id97" name="id97">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id98" name="id98">Miscellaneous</a></li> +<li><a class="reference" href="#id2" id="id96" name="id96">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-preferences" id="id99" name="id99">Toolbar preferences</a><ul> -<li><a class="reference" href="#toolbar" id="id100" name="id100">Toolbar</a></li> -<li><a class="reference" href="#appearance" id="id101" name="id101">Appearance</a></li> +<li><a class="reference" href="#interface-notebook-tab-preferences" id="id97" name="id97">Interface Notebook tab preferences</a><ul> +<li><a class="reference" href="#editor-tabs" id="id98" name="id98">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id99" name="id99">Tab positions</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-preferences" id="id102" name="id102">Editor Features preferences</a><ul> -<li><a class="reference" href="#features" id="id103" name="id103">Features</a></li> +<li><a class="reference" href="#interface-toolbar-preferences" id="id100" name="id100">Interface Toolbar preferences</a><ul> +<li><a class="reference" href="#toolbar" id="id101" name="id101">Toolbar</a></li> +<li><a class="reference" href="#appearance" id="id102" name="id102">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-indentation-preferences" id="id104" name="id104">Editor Indentation preferences</a><ul> -<li><a class="reference" href="#indentation-group" id="id105" name="id105">Indentation group</a></li> +<li><a class="reference" href="#editor-features-preferences" id="id103" name="id103">Editor Features preferences</a><ul> +<li><a class="reference" href="#features" id="id104" name="id104">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-preferences" id="id106" name="id106">Editor Completions preferences</a><ul> -<li><a class="reference" href="#completions" id="id107" name="id107">Completions</a></li> -<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id108" name="id108">Auto-close quotes and brackets</a></li> +<li><a class="reference" href="#editor-indentation-preferences" id="id105" name="id105">Editor Indentation preferences</a><ul> +<li><a class="reference" href="#indentation-group" id="id106" name="id106">Indentation group</a></li> </ul> </li> -<li><a class="reference" href="#editor-display-preferences" id="id109" name="id109">Editor Display preferences</a><ul> -<li><a class="reference" href="#display" id="id110" name="id110">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id111" name="id111">Long line marker</a></li> -<li><a class="reference" href="#virtual-spaces" id="id112" name="id112">Virtual spaces</a></li> +<li><a class="reference" href="#editor-completions-preferences" id="id107" name="id107">Editor Completions preferences</a><ul> +<li><a class="reference" href="#completions" id="id108" name="id108">Completions</a></li> +<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id109" name="id109">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference" href="#files-preferences" id="id113" name="id113">Files preferences</a><ul> -<li><a class="reference" href="#new-files" id="id114" name="id114">New files</a></li> -<li><a class="reference" href="#saving-files" id="id115" name="id115">Saving files</a></li> -<li><a class="reference" href="#id3" id="id116" name="id116">Miscellaneous</a></li> +<li><a class="reference" href="#editor-display-preferences" id="id110" name="id110">Editor Display preferences</a><ul> +<li><a class="reference" href="#display" id="id111" name="id111">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id112" name="id112">Long line marker</a></li> +<li><a class="reference" href="#virtual-spaces" id="id113" name="id113">Virtual spaces</a></li> </ul> </li> -<li><a class="reference" href="#tools-preferences" id="id117" name="id117">Tools preferences</a><ul> -<li><a class="reference" href="#tool-paths" id="id118" name="id118">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id119" name="id119">Commands</a></li> +<li><a class="reference" href="#files-preferences" id="id114" name="id114">Files preferences</a><ul> +<li><a class="reference" href="#new-files" id="id115" name="id115">New files</a></li> +<li><a class="reference" href="#saving-files" id="id116" name="id116">Saving files</a></li> +<li><a class="reference" href="#id3" id="id117" name="id117">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#template-preferences" id="id120" name="id120">Template preferences</a><ul> -<li><a class="reference" href="#template-data" id="id121" name="id121">Template data</a></li> +<li><a class="reference" href="#tools-preferences" id="id118" name="id118">Tools preferences</a><ul> +<li><a class="reference" href="#tool-paths" id="id119" name="id119">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id120" name="id120">Commands</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-preferences" id="id122" name="id122">Keybinding preferences</a></li> -<li><a class="reference" href="#printing-preferences" id="id123" name="id123">Printing preferences</a></li> -<li><a class="reference" href="#terminal-vte-preferences" id="id124" name="id124">Terminal (VTE) preferences</a><ul> -<li><a class="reference" href="#terminal-widget" id="id125" name="id125">Terminal widget</a></li> +<li><a class="reference" href="#template-preferences" id="id121" name="id121">Template preferences</a><ul> +<li><a class="reference" href="#template-data" id="id122" name="id122">Template data</a></li> </ul> </li> +<li><a class="reference" href="#keybinding-preferences" id="id123" name="id123">Keybinding preferences</a></li> +<li><a class="reference" href="#printing-preferences" id="id124" name="id124">Printing preferences</a></li> +<li><a class="reference" href="#terminal-vte-preferences" id="id125" name="id125">Terminal (VTE) preferences</a><ul> +<li><a class="reference" href="#terminal-widget" id="id126" name="id126">Terminal widget</a></li> </ul> </li> -<li><a class="reference" href="#project-management" id="id126" name="id126">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id127" name="id127">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id128" name="id128">Project Properties</a></li> -<li><a class="reference" href="#open-project" id="id129" name="id129">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id130" name="id130">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-menu" id="id131" name="id131">Build Menu</a><ul> -<li><a class="reference" href="#indicators" id="id132" name="id132">Indicators</a></li> -<li><a class="reference" href="#default-build-menu-items" id="id133" name="id133">Default Build Menu Items</a><ul> -<li><a class="reference" href="#compile" id="id134" name="id134">Compile</a></li> -<li><a class="reference" href="#build" id="id135" name="id135">Build</a></li> -<li><a class="reference" href="#make" id="id136" name="id136">Make</a></li> -<li><a class="reference" href="#make-custom-target" id="id137" name="id137">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id138" name="id138">Make object</a></li> -<li><a class="reference" href="#next-error" id="id139" name="id139">Next Error</a></li> -<li><a class="reference" href="#previous-error" id="id140" name="id140">Previous Error</a></li> -<li><a class="reference" href="#execute" id="id141" name="id141">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id142" name="id142">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id143" name="id143">Terminal emulators</a></li> +<li><a class="reference" href="#project-management" id="id127" name="id127">Project management</a><ul> +<li><a class="reference" href="#new-project" id="id128" name="id128">New project</a></li> +<li><a class="reference" href="#project-properties" id="id129" name="id129">Project properties</a></li> +<li><a class="reference" href="#open-project" id="id130" name="id130">Open project</a></li> +<li><a class="reference" href="#close-project" id="id131" name="id131">Close project</a></li> </ul> </li> -<li><a class="reference" href="#set-build-commands" id="id144" name="id144">Set Build Commands</a></li> +<li><a class="reference" href="#build-menu" id="id132" name="id132">Build menu</a><ul> +<li><a class="reference" href="#indicators" id="id133" name="id133">Indicators</a></li> +<li><a class="reference" href="#default-build-menu-items" id="id134" name="id134">Default build menu items</a><ul> +<li><a class="reference" href="#compile" id="id135" name="id135">Compile</a></li> +<li><a class="reference" href="#build" id="id136" name="id136">Build</a></li> +<li><a class="reference" href="#make" id="id137" name="id137">Make</a></li> +<li><a class="reference" href="#make-custom-target" id="id138" name="id138">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id139" name="id139">Make object</a></li> +<li><a class="reference" href="#next-error" id="id140" name="id140">Next error</a></li> +<li><a class="reference" href="#previous-error" id="id141" name="id141">Previous error</a></li> +<li><a class="reference" href="#execute" id="id142" name="id142">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id143" name="id143">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id144" name="id144">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#build-menu-configuration" id="id145" name="id145">Build Menu Configuration</a></li> -<li><a class="reference" href="#build-menu-commands-dialog" id="id146" name="id146">Build Menu Commands Dialog</a><ul> -<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id147" name="id147">Substitutions in Commands and Working Directories</a></li> -<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id148" name="id148">Build Menu Keyboard Shortcuts</a></li> -<li><a class="reference" href="#old-settings" id="id149" name="id149">Old settings</a></li> +<li><a class="reference" href="#set-build-commands" id="id145" name="id145">Set build commands</a></li> </ul> </li> +<li><a class="reference" href="#build-menu-configuration" id="id146" name="id146">Build menu configuration</a></li> +<li><a class="reference" href="#build-menu-commands-dialog" id="id147" name="id147">Build menu commands dialog</a><ul> +<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id148" name="id148">Substitutions in commands and working directories</a></li> +<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id149" name="id149">Build menu keyboard shortcuts</a></li> +<li><a class="reference" href="#old-settings" id="id150" name="id150">Old settings</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id150" name="id150">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id151" name="id151">Plugins</a><ul> -<li><a class="reference" href="#plugin-manager" id="id152" name="id152">Plugin Manager</a></li> </ul> </li> -<li><a class="reference" href="#keybindings" id="id153" name="id153">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id154" name="id154">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id155" name="id155">Configurable keybindings</a><ul> -<li><a class="reference" href="#file-keybindings" id="id156" name="id156">File keybindings</a></li> -<li><a class="reference" href="#editor-keybindings" id="id157" name="id157">Editor keybindings</a></li> -<li><a class="reference" href="#clipboard-keybindings" id="id158" name="id158">Clipboard keybindings</a></li> -<li><a class="reference" href="#select-keybindings" id="id159" name="id159">Select keybindings</a></li> -<li><a class="reference" href="#insert-keybindings" id="id160" name="id160">Insert keybindings</a></li> -<li><a class="reference" href="#format-keybindings" id="id161" name="id161">Format keybindings</a></li> -<li><a class="reference" href="#settings-keybindings" id="id162" name="id162">Settings keybindings</a></li> -<li><a class="reference" href="#search-keybindings" id="id163" name="id163">Search keybindings</a></li> -<li><a class="reference" href="#go-to-keybindings" id="id164" name="id164">Go to keybindings</a></li> -<li><a class="reference" href="#view-keybindings" id="id165" name="id165">View keybindings</a></li> -<li><a class="reference" href="#focus-keybindings" id="id166" name="id166">Focus keybindings</a></li> -<li><a class="reference" href="#notebook-tab-keybindings" id="id167" name="id167">Notebook tab keybindings</a></li> -<li><a class="reference" href="#document-keybindings" id="id168" name="id168">Document keybindings</a></li> -<li><a class="reference" href="#build-keybindings" id="id169" name="id169">Build keybindings</a></li> -<li><a class="reference" href="#tools-keybindings" id="id170" name="id170">Tools keybindings</a></li> -<li><a class="reference" href="#help-keybindings" id="id171" name="id171">Help keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id151" name="id151">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id152" name="id152">Plugins</a><ul> +<li><a class="reference" href="#plugin-manager" id="id153" name="id153">Plugin manager</a></li> </ul> </li> +<li><a class="reference" href="#keybindings" id="id154" name="id154">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id155" name="id155">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id156" name="id156">Configurable keybindings</a><ul> +<li><a class="reference" href="#file-keybindings" id="id157" name="id157">File keybindings</a></li> +<li><a class="reference" href="#editor-keybindings" id="id158" name="id158">Editor keybindings</a></li> +<li><a class="reference" href="#clipboard-keybindings" id="id159" name="id159">Clipboard keybindings</a></li> +<li><a class="reference" href="#select-keybindings" id="id160" name="id160">Select keybindings</a></li> +<li><a class="reference" href="#insert-keybindings" id="id161" name="id161">Insert keybindings</a></li> +<li><a class="reference" href="#format-keybindings" id="id162" name="id162">Format keybindings</a></li> +<li><a class="reference" href="#settings-keybindings" id="id163" name="id163">Settings keybindings</a></li> +<li><a class="reference" href="#search-keybindings" id="id164" name="id164">Search keybindings</a></li> +<li><a class="reference" href="#go-to-keybindings" id="id165" name="id165">Go to keybindings</a></li> +<li><a class="reference" href="#view-keybindings" id="id166" name="id166">View keybindings</a></li> +<li><a class="reference" href="#focus-keybindings" id="id167" name="id167">Focus keybindings</a></li> +<li><a class="reference" href="#notebook-tab-keybindings" id="id168" name="id168">Notebook tab keybindings</a></li> +<li><a class="reference" href="#document-keybindings" id="id169" name="id169">Document keybindings</a></li> +<li><a class="reference" href="#build-keybindings" id="id170" name="id170">Build keybindings</a></li> +<li><a class="reference" href="#tools-keybindings" id="id171" name="id171">Tools keybindings</a></li> +<li><a class="reference" href="#help-keybindings" id="id172" name="id172">Help keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id172" name="id172">Configuration files</a><ul> -<li><a class="reference" href="#configuration-file-paths" id="id173" name="id173">Configuration file paths</a><ul> -<li><a class="reference" href="#paths-on-unix-like-systems" id="id174" name="id174">Paths on Unix-like systems</a></li> </ul> </li> -<li><a class="reference" href="#tools-menu-items" id="id175" name="id175">Tools menu items</a></li> -<li><a class="reference" href="#global-configuration-file" id="id176" name="id176">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id177" name="id177">Filetype definition files</a><ul> -<li><a class="reference" href="#filenames" id="id178" name="id178">Filenames</a></li> -<li><a class="reference" href="#system-files" id="id179" name="id179">System files</a></li> -<li><a class="reference" href="#user-files" id="id180" name="id180">User files</a></li> -<li><a class="reference" href="#custom-filetypes" id="id181" name="id181">Custom filetypes</a><ul> -<li><a class="reference" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id182" name="id182">Creating a custom filetype from an existing filetype</a></li> +<li><a class="reference" href="#configuration-files" id="id173" name="id173">Configuration files</a><ul> +<li><a class="reference" href="#configuration-file-paths" id="id174" name="id174">Configuration file paths</a><ul> +<li><a class="reference" href="#paths-on-unix-like-systems" id="id175" name="id175">Paths on Unix-like systems</a></li> </ul> </li> -<li><a class="reference" href="#filetype-configuration" id="id183" name="id183">Filetype configuration</a><ul> -<li><a class="reference" href="#styling-section" id="id184" name="id184">[styling] Section</a><ul> -<li><a class="reference" href="#using-a-named-style" id="id185" name="id185">Using a named style</a></li> -<li><a class="reference" href="#reading-styles-from-another-filetype" id="id186" name="id186">Reading styles from another filetype</a></li> +<li><a class="reference" href="#tools-menu-items" id="id176" name="id176">Tools menu items</a></li> +<li><a class="reference" href="#global-configuration-file" id="id177" name="id177">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id178" name="id178">Filetype definition files</a><ul> +<li><a class="reference" href="#filenames" id="id179" name="id179">Filenames</a></li> +<li><a class="reference" href="#system-files" id="id180" name="id180">System files</a></li> +<li><a class="reference" href="#user-files" id="id181" name="id181">User files</a></li> +<li><a class="reference" href="#custom-filetypes" id="id182" name="id182">Custom filetypes</a><ul> +<li><a class="reference" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id183" name="id183">Creating a custom filetype from an existing filetype</a></li> </ul> </li> -<li><a class="reference" href="#keywords-section" id="id187" name="id187">[keywords] Section</a></li> -<li><a class="reference" href="#lexer-properties-section" id="id188" name="id188">[lexer_properties] Section</a></li> -<li><a class="reference" href="#settings-section" id="id189" name="id189">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id190" name="id190">[build_settings] Section</a></li> +<li><a class="reference" href="#filetype-configuration" id="id184" name="id184">Filetype configuration</a><ul> +<li><a class="reference" href="#styling-section" id="id185" name="id185">[styling] section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id186" name="id186">Using a named style</a></li> +<li><a class="reference" href="#reading-styles-from-another-filetype" id="id187" name="id187">Reading styles from another filetype</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id191" name="id191">Special file filetypes.common</a><ul> -<li><a class="reference" href="#named-styles-section" id="id192" name="id192">[named_styles] Section</a></li> -<li><a class="reference" href="#id4" id="id193" name="id193">[styling] Section</a></li> -<li><a class="reference" href="#id5" id="id194" name="id194">[settings] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id188" name="id188">[keywords] section</a></li> +<li><a class="reference" href="#lexer-properties-section" id="id189" name="id189">[lexer_properties] section</a></li> +<li><a class="reference" href="#settings-section" id="id190" name="id190">[settings] section</a></li> +<li><a class="reference" href="#build-settings-section" id="id191" name="id191">[build_settings] section</a></li> </ul> </li> +<li><a class="reference" href="#special-file-filetypes-common" id="id192" name="id192">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id193" name="id193">[named_styles] section</a></li> +<li><a class="reference" href="#id4" id="id194" name="id194">[styling] section</a></li> +<li><a class="reference" href="#id5" id="id195" name="id195">[settings] section</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id195" name="id195">Filetype extensions</a></li> -<li><a class="reference" href="#preferences-file-format" id="id196" name="id196">Preferences File Format</a><ul> -<li><a class="reference" href="#hidden-preferences" id="id197" name="id197">Hidden preferences</a></li> -<li><a class="reference" href="#build-menu-section" id="id198" name="id198">[build-menu] Section</a></li> </ul> </li> -<li><a class="reference" href="#project-file-format" id="id199" name="id199">Project File Format</a><ul> -<li><a class="reference" href="#build-menu-additions" id="id200" name="id200">[build-menu] Additions</a></li> +<li><a class="reference" href="#filetype-extensions" id="id196" name="id196">Filetype extensions</a></li> +<li><a class="reference" href="#preferences-file-format" id="id197" name="id197">Preferences file format</a><ul> +<li><a class="reference" href="#hidden-preferences" id="id198" name="id198">Hidden preferences</a></li> +<li><a class="reference" href="#build-menu-section" id="id199" name="id199">[build-menu] section</a></li> </ul> </li> -<li><a class="reference" href="#templates" id="id201" name="id201">Templates</a><ul> -<li><a class="reference" href="#template-meta-data" id="id202" name="id202">Template meta data</a></li> -<li><a class="reference" href="#file-templates" id="id203" name="id203">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id204" name="id204">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id205" name="id205">Filetype templates</a></li> +<li><a class="reference" href="#project-file-format" id="id200" name="id200">Project file format</a><ul> +<li><a class="reference" href="#build-menu-additions" id="id201" name="id201">[build-menu] additions</a></li> </ul> </li> +<li><a class="reference" href="#templates" id="id202" name="id202">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id203" name="id203">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id204" name="id204">File templates</a><ul> +<li><a class="reference" href="#adding-file-templates" id="id205" name="id205">Adding file templates</a></li> +</ul> +</li> <li><a class="reference" href="#customizing-templates" id="id206" name="id206">Customizing templates</a><ul> <li><a class="reference" href="#template-wildcards" id="id207" name="id207">Template wildcards</a><ul> <li><a class="reference" href="#special-command-wildcard" id="id208" name="id208">Special {command:} wildcard</a></li> @@ -619,7 +621,7 @@ % ./waf install </pre> <div class="section"> -<h4><a class="toc-backref" href="#id18" id="waf-cache" name="waf-cache">Waf Cache</a></h4> +<h4><a class="toc-backref" href="#id18" id="waf-cache" name="waf-cache">Waf cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help to avoid a lot of unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something in Geany. @@ -639,7 +641,7 @@ <p>More information about the Waf cache feature are available at <a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> <div class="section"> -<h5><a class="toc-backref" href="#id19" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> +<h5><a class="toc-backref" href="#id19" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the cache</a></h5> <p>You should be careful about the size of the cache directory as it may grow rapidly over time. Waf doesn't do any cleaning or other house-keeping of the cache yet, so you need to keep it @@ -1032,10 +1034,8 @@ <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab -order. Its is not alphabetical as shown in the documents list +order. It is not alphabetical as shown in the documents list (regardless of whether or not editor tabs are visible).</p> -<p>The tabs can be positioned at the top, bottom, left, or right of the -main editing window, by a selection in the interface preferences.</p> <p>See the <a class="reference" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful shortcuts including for Most-Recently-Used document switching.</p> </div> @@ -1223,7 +1223,7 @@ for more information).</p> <p>The default settings can be overridden per-document using the Document menu. They can also be overridden by projects - see -<a class="reference" href="#project-management">Project Management</a>.</p> +<a class="reference" href="#project-management">Project management</a>.</p> <p>The indent mode for the current document is shown on the status bar as follows:</p> <dl class="docutils"> @@ -1322,11 +1322,11 @@ Geany. To help finding errors in executing the command, the output of the program's standard error will be printed on Geany's standard output.</p> +<p>If there is no selection, the whole current line is used instead.</p> <p>To add a custom command, use the <em>Send Selection to->Set Custom -Commands</em> menu item. Click on <em>Add</em> to get a new text entry and type -the command. You can also specify some command line options. To -delete a command, just clear the text entry and press OK. It will be -deleted automatically.</p> +Commands</em> menu item. Click on <em>Add</em> to get a new item and type the +command. You can also specify some command line options. Empty +commands are not saved.</p> <p>Normal shell quoting is supported, so you can do things like:</p> <ul class="simple"> <li><tt class="docutils literal"><span class="pre">sed</span> <span class="pre">'s/\./(dot)/g'</span></tt></li> @@ -2036,7 +2036,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id83" id="c-ignore-tags" name="c-ignore-tags">C Ignore tags</a></h3> +<h3><a class="toc-backref" href="#id83" id="c-ignore-tags" name="c-ignore-tags">C ignore.tags</a></h3> <p>You can ignore certain tags for C-based languages if they would lead to wrong parsing of the code. Use the <em>Tools->Configuration Files->ignore.tags</em> menu item to open the user <tt class="docutils literal"><span class="pre">ignore.tags</span></tt> file. @@ -2226,8 +2226,20 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id96" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<h4><a class="toc-backref" href="#id96" id="id2" name="id2">Miscellaneous</a></h4> <dl class="docutils"> +<dt>Show status bar</dt> +<dd>Show the status bar at the bottom of the main window. It gives information about +the file you are editing like the line and column you are on, whether any +modifications were done, the file encoding, the filetype and other information.</dd> +</dl> +</div> +</div> +<div class="section"> +<h3><a class="toc-backref" href="#id97" id="interface-notebook-tab-preferences" name="interface-notebook-tab-preferences">Interface Notebook tab preferences</a></h3> +<div class="section"> +<h4><a class="toc-backref" href="#id98" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them using the mouse (instead of using the Documents window).</dd> @@ -2246,7 +2258,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id97" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<h4><a class="toc-backref" href="#id99" id="tab-positions" name="tab-positions">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -2259,22 +2271,13 @@ right, left, top, or bottom of the message window.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id98" id="id2" name="id2">Miscellaneous</a></h4> -<dl class="docutils"> -<dt>Show status bar</dt> -<dd>Show the status bar at the bottom of the main window. It gives information about -the file you are editing like the line and column you are on, whether any -modifications were done, the file encoding, the filetype and other information.</dd> -</dl> </div> -</div> <div class="section"> -<h3><a class="toc-backref" href="#id99" id="toolbar-preferences" name="toolbar-preferences">Toolbar preferences</a></h3> +<h3><a class="toc-backref" href="#id100" id="interface-toolbar-preferences" name="interface-toolbar-preferences">Interface Toolbar preferences</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id100" id="toolbar" name="toolbar">Toolbar</a></h4> +<h4><a class="toc-backref" href="#id101" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> @@ -2286,7 +2289,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id101" id="appearance" name="appearance">Appearance</a></h4> +<h4><a class="toc-backref" href="#id102" id="appearance" name="appearance">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -2299,10 +2302,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id102" id="editor-features-preferences" name="editor-features-preferences">Editor Features preferences</a></h3> +<h3><a class="toc-backref" href="#id103" id="editor-features-preferences" name="editor-features-preferences">Editor Features preferences</a></h3> <img alt="./images/pref_dialog_edit_features.png" src="./images/pref_dialog_edit_features.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id103" id="features" name="features">Features</a></h4> +<h4><a class="toc-backref" href="#id104" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -2334,10 +2337,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id104" id="editor-indentation-preferences" name="editor-indentation-preferences">Editor Indentation preferences</a></h3> +<h3><a class="toc-backref" href="#id105" id="editor-indentation-preferences" name="editor-indentation-preferences">Editor Indentation preferences</a></h3> <img alt="./images/pref_dialog_edit_indentation.png" src="./images/pref_dialog_edit_indentation.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id105" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<h4><a class="toc-backref" href="#id106" id="indentation-group" name="indentation-group">Indentation group</a></h4> <p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Width</dt> @@ -2389,10 +2392,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id106" id="editor-completions-preferences" name="editor-completions-preferences">Editor Completions preferences</a></h3> +<h3><a class="toc-backref" href="#id107" id="editor-completions-preferences" name="editor-completions-preferences">Editor Completions preferences</a></h3> <img alt="./images/pref_dialog_edit_completions.png" src="./images/pref_dialog_edit_completions.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id107" id="completions" name="completions">Completions</a></h4> +<h4><a class="toc-backref" href="#id108" id="completions" name="completions">Completions</a></h4> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a @@ -2449,7 +2452,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id108" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> +<h4><a class="toc-backref" href="#id109" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> <p>Geany can automatically insert a closing bracket and quote characters when you open them. For instance, you type a <tt class="docutils literal"><span class="pre">(</span></tt> and Geany will automatically insert <tt class="docutils literal"><span class="pre">)</span></tt>. With the following options, you can define for which @@ -2469,11 +2472,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id109" id="editor-display-preferences" name="editor-display-preferences">Editor Display preferences</a></h3> +<h3><a class="toc-backref" href="#id110" id="editor-display-preferences" name="editor-display-preferences">Editor Display preferences</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_edit_display.png" src="./images/pref_dialog_edit_display.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id110" id="display" name="display">Display</a></h4> +<h4><a class="toc-backref" href="#id111" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Invert syntax highlighting colors</dt> <dd>Invert all colors, by default this makes white text on a black @@ -2498,7 +2501,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id111" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<h4><a class="toc-backref" href="#id112" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -2523,7 +2526,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id112" id="virtual-spaces" name="virtual-spaces">Virtual spaces</a></h4> +<h4><a class="toc-backref" href="#id113" id="virtual-spaces" name="virtual-spaces">Virtual spaces</a></h4> <p>Virtual space is space beyond the end of each line. The cursor may be moved into virtual space but no real space will be added to the document until there is some text typed or some other @@ -2539,10 +2542,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id113" id="files-preferences" name="files-preferences">Files preferences</a></h3> +<h3><a class="toc-backref" href="#id114" id="files-preferences" name="files-preferences">Files preferences</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id114" id="new-files" name="new-files">New files</a></h4> +<h4><a class="toc-backref" href="#id115" id="new-files" name="new-files">New files</a></h4> <dl class="docutils"> <dt>Open new documents from the command-line</dt> <dd>Whether to create new documents when passing filenames that don't @@ -2562,7 +2565,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id115" id="saving-files" name="saving-files">Saving files</a></h4> +<h4><a class="toc-backref" href="#id116" id="saving-files" name="saving-files">Saving files</a></h4> <p>Perform formatting operations when a document is saved. These can each be undone with the Undo command.</p> <dl class="docutils"> @@ -2584,7 +2587,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id116" id="id3" name="id3">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id117" id="id3" name="id3">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -2603,10 +2606,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id117" id="tools-preferences" name="tools-preferences">Tools preferences</a></h3> +<h3><a class="toc-backref" href="#id118" id="tools-preferences" name="tools-preferences">Tools preferences</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id118" id="tool-paths" name="tool-paths">Tool paths</a></h4> +<h4><a class="toc-backref" href="#id119" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> <dt>Terminal</dt> <dd>The location of your terminal executable.</dd> @@ -2624,7 +2627,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id119" id="commands" name="commands">Commands</a></h4> +<h4><a class="toc-backref" href="#id120" id="commands" name="commands">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -2634,7 +2637,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id120" id="template-preferences" name="template-preferences">Template preferences</a></h3> +<h3><a class="toc-backref" href="#id121" id="template-preferences" name="template-preferences">Template preferences</a></h3> <p>This data is used as meta data for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -2645,7 +2648,7 @@ </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id121" id="template-data" name="template-data">Template data</a></h4> +<h4><a class="toc-backref" href="#id122" id="template-data" name="template-data">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -2678,7 +2681,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id122" id="keybinding-preferences" name="keybinding-preferences">Keybinding preferences</a></h3> +<h3><a class="toc-backref" href="#id123" id="keybinding-preferences" name="keybinding-preferences">Keybinding preferences</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some commands listed in the keybinding dialog that are not, by default, bound to a key combination, and may not be available as a menu item.</p> @@ -2688,7 +2691,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id123" id="printing-preferences" name="printing-preferences">Printing preferences</a></h3> +<h3><a class="toc-backref" href="#id124" id="printing-preferences" name="printing-preferences">Printing preferences</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -2710,11 +2713,11 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id124" id="terminal-vte-preferences" name="terminal-vte-preferences">Terminal (VTE) preferences</a></h3> +<h3><a class="toc-backref" href="#id125" id="terminal-vte-preferences" name="terminal-vte-preferences">Terminal (VTE) preferences</a></h3> <p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id125" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> +<h4><a class="toc-backref" href="#id126" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -2753,8 +2756,8 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id126" id="project-management" name="project-management">Project Management</a></h2> -<p>Project Management is optional in Geany. Currently it can be used for:</p> +<h2><a class="toc-backref" href="#id127" id="project-management" name="project-management">Project management</a></h2> +<p>Project management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> <li>Overriding default settings with project equivalents.</li> @@ -2771,7 +2774,7 @@ file that was in use at the end of the last session will be reopened.</p> <p>The project menu items are detailed below.</p> <div class="section"> -<h3><a class="toc-backref" href="#id127" id="new-project" name="new-project">New Project</a></h3> +<h3><a class="toc-backref" href="#id128" id="new-project" name="new-project">New project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2781,7 +2784,7 @@ structure contained in it.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id128" id="project-properties" name="project-properties">Project Properties</a></h3> +<h3><a class="toc-backref" href="#id129" id="project-properties" name="project-properties">Project properties</a></h3> <p>You can set an optional description for the project. Currently it's only used for a template wildcard - see <a class="reference" href="#template-wildcards">Template wildcards</a>.</p> <p>The <em>Base path</em> field is used as the directory to run the Build menu commands. @@ -2791,7 +2794,7 @@ <a class="reference" href="#indentation">Indentation</a> settings.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id129" id="open-project" name="open-project">Open Project</a></h3> +<h3><a class="toc-backref" href="#id130" id="open-project" name="open-project">Open project</a></h3> <p>The Open command displays a standard file chooser, starting in <tt class="docutils literal"><span class="pre">~/projects</span></tt>. Choose a project file named with the <tt class="docutils literal"><span class="pre">.geany</span></tt> extension.</p> @@ -2799,14 +2802,14 @@ open files and open the session files associated with the project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id130" id="close-project" name="close-project">Close Project</a></h3> +<h3><a class="toc-backref" href="#id131" id="close-project" name="close-project">Close project</a></h3> <p>Project file settings are saved when the project is closed.</p> <p>When project session support is enabled, Geany will close the project session files and open any previously closed default session files.</p> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id131" id="build-menu" name="build-menu">Build Menu</a></h2> +<h2><a class="toc-backref" href="#id132" id="build-menu" name="build-menu">Build menu</a></h2> <p>After editing code with Geany, the next step is to compile, link, build, interpret, run etc. As Geany supports many languages each with a different approach to such operations, and as there are also many language independent @@ -2833,7 +2836,7 @@ Dialog, see <a class="reference" href="#build-menu-configuration">Build Menu Configuration</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id132" id="indicators" name="indicators">Indicators</a></h3> +<h3><a class="toc-backref" href="#id133" id="indicators" name="indicators">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight errors which occurred while compiling the current file. So you can easily see where your code failed to compile. You can remove them by @@ -2842,7 +2845,7 @@ preferences</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id133" id="default-build-menu-items" name="default-build-menu-items">Default Build Menu Items</a></h3> +<h3><a class="toc-backref" href="#id134" id="default-build-menu-items" name="default-build-menu-items">Default build menu items</a></h3> <p>Depending on the current file's filetype, the default Build menu will contain the following items:</p> <ul class="simple"> @@ -2857,7 +2860,7 @@ <li>Set Build Menu Commands</li> </ul> <div class="section"> -<h4><a class="toc-backref" href="#id134" id="compile" name="compile">Compile</a></h4> +<h4><a class="toc-backref" href="#id135" id="compile" name="compile">Compile</a></h4> <p>The Compile command has different uses for different kinds of files.</p> <p>For compilable languages such as C and C++, the Compile command is set up to compile the current source file into a binary object file.</p> @@ -2867,7 +2870,7 @@ or if that is not available will run the file in its language interpreter.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id135" id="build" name="build">Build</a></h4> +<h4><a class="toc-backref" href="#id136" id="build" name="build">Build</a></h4> <p>For compilable languages such as C and C++, the Build command will link the current source file's equivalent object file into an executable. If the object file does not exist, the source will be compiled and linked @@ -2882,32 +2885,32 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id136" id="make" name="make">Make</a></h4> +<h4><a class="toc-backref" href="#id137" id="make" name="make">Make</a></h4> <p>This runs "make" in the same directory as the current file.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id137" id="make-custom-target" name="make-custom-target">Make custom target</a></h4> +<h4><a class="toc-backref" href="#id138" id="make-custom-target" name="make-custom-target">Make custom target</a></h4> <p>This is similar to running 'Make' but you will be prompted for the make target name to be passed to the Make tool. For example, typing 'clean' in the dialog prompt will run "make clean".</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id138" id="make-object" name="make-object">Make object</a></h4> +<h4><a class="toc-backref" href="#id139" id="make-object" name="make-object">Make object</a></h4> <p>Make object will run "make current_file.o" in the same directory as the current file, using the filename for 'current_file'. It is useful for building just the current file without building the whole project.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id139" id="next-error" name="next-error">Next Error</a></h4> +<h4><a class="toc-backref" href="#id140" id="next-error" name="next-error">Next error</a></h4> <p>The next error item will move to the next detected error in the file.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id140" id="previous-error" name="previous-error">Previous Error</a></h4> +<h4><a class="toc-backref" href="#id141" id="previous-error" name="previous-error">Previous error</a></h4> <p>The previous error item will move to the previous detected error in the file.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id141" id="execute" name="execute">Execute</a></h4> +<h4><a class="toc-backref" href="#id142" id="execute" name="execute">Execute</a></h4> <p>Execute will run the corresponding executable file, shell script or interpreted script in a terminal window. Note that the Terminal tool path must be correctly set in the Tools tab of the Preferences dialog - @@ -2924,7 +2927,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id142" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h4> +<h4><a class="toc-backref" href="#id143" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h4> <p>When there is a running program, the Execute menu item in the menu and the Run button in the toolbar each become a stop button so you can stop the current running program (and @@ -2933,7 +2936,7 @@ cannot be stopped. For example this can happen when the process creates more than one child process.</p> <div class="section"> -<h5><a class="toc-backref" href="#id143" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h5> +<h5><a class="toc-backref" href="#id144" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h5> <p>Xterm is known to work properly. If you are using "Terminal" (the terminal program of Xfce), you should add the command line option <tt class="docutils literal"><span class="pre">--disable-server</span></tt> otherwise the started process cannot be @@ -2942,7 +2945,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id144" id="set-build-commands" name="set-build-commands">Set Build Commands</a></h4> +<h4><a class="toc-backref" href="#id145" id="set-build-commands" name="set-build-commands">Set build commands</a></h4> <p>By default Compile, Build and Execute are fairly basic commands. You may wish to customise them using <em>Set Build Commands</em>.</p> <p>E.g. for C you can add any include paths and compile flags for the @@ -2951,7 +2954,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id145" id="build-menu-configuration" name="build-menu-configuration">Build Menu Configuration</a></h3> +<h3><a class="toc-backref" href="#id146" id="build-menu-configuration" name="build-menu-configuration">Build menu configuration</a></h3> <p>The build menu has considerable flexibility and configurability, allowing both menu labels the commands they execute and the directory they execute in to be configured.</p> @@ -2978,7 +2981,7 @@ </li> </ul> <p>The maximum numbers of items in each of the configurable groups can be -configured when Geany starts using hidden settings (see <a class="reference" href="#preferences-file-format">Preferences File Format</a>). +configured when Geany starts using hidden settings (see <a class="reference" href="#preferences-file-format">Preferences file format</a>). Even though the maximum number of items may have been increased, only those menu items that have values configured are shown in the menu.</p> <p>The groups of menu items obtain their configuration from four potential @@ -3105,12 +3108,12 @@ define filetype dependent default menu items.</li> <li>(Execute, Project File) and (Execute, Preferences) - the project independent execute and preferences independent execute commands can only be set by hand -editing the appropriate file, see <a class="reference" href="#preferences-file-format">Preferences File Format</a> and <a class="reference" href="#project-file-format">Project File -Format</a>.</li> +editing the appropriate file, see <a class="reference" href="#preferences-file-format">Preferences file format</a> and <a class="reference" href="#project-file-format">Project file +format</a>.</li> </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id146" id="build-menu-commands-dialog" name="build-menu-commands-dialog">Build Menu Commands Dialog</a></h3> +<h3><a class="toc-backref" href="#id147" id="build-menu-commands-dialog" name="build-menu-commands-dialog">Build menu commands dialog</a></h3> <p>Most of the configuration of the build menu is done through the Build Menu Commands Dialog. You edit the configuration sourced from preferences in the dialog opened from the Build->Build Menu Commands item and you edit the @@ -3142,7 +3145,7 @@ To hide lower priority menu items without having anything show in the menu configure with a nothing in the label but at least one character in the command.</p> <div class="section"> -<h4><a class="toc-backref" href="#id147" id="substitutions-in-commands-and-working-directories" name="substitutions-in-commands-and-working-directories">Substitutions in Commands and Working Directories</a></h4> +<h4><a class="toc-backref" href="#id148" id="substitutions-in-commands-and-working-directories" name="substitutions-in-commands-and-working-directories">Substitutions in commands and working directories</a></h4> <p>The first occurence of each of the following character sequences in each of the command and working directory fields is substituted by the items specified below before the command is run.</p> @@ -3163,7 +3166,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id148" id="build-menu-keyboard-shortcuts" name="build-menu-keyboard-shortcuts">Build Menu Keyboard Shortcuts</a></h4> +<h4><a class="toc-backref" href="#id149" id="build-menu-keyboard-shortcuts" name="build-menu-keyboard-shortcuts">Build menu keyboard shortcuts</a></h4> <p>Keyboard shortcuts can be defined for the first two filetype menu items, the first three independent menu items, the first two execute menu items and the fixed menu items. In the keybindings configuration dialog (see <a class="reference" href="#keybinding-preferences">Keybinding preferences</a>) @@ -3172,10 +3175,10 @@ <p>You can also use underlines in the labels to set mnemonic characters.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id149" id="old-settings" name="old-settings">Old settings</a></h4> +<h4><a class="toc-backref" href="#id150" id="old-settings" name="old-settings">Old settings</a></h4> <p>The configurable Build Menu capability was introduced in Geany 0.19 and required a new section to be added to the configuration files (See -<a class="reference" href="#preferences-file-format">Preferences File Format</a>). Geany will still load older format project, +<a class="reference" href="#preferences-file-format">Preferences file format</a>). Geany will still load older format project, preferences and filetype file settings and will attempt to map them into the new configuration format. There is not a simple clean mapping between the formats. The mapping used produces the most sensible results for the majority of cases. @@ -3188,7 +3191,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id150" id="printing-support" name="printing-support">Printing support</a></h2> +<h2><a class="toc-backref" href="#id151" id="printing-support" name="printing-support">Printing support</a></h2> <p>Since Geany 0.13 there has been printing support using GTK's printing API. The printed page(s) will look nearly the same as on your screen in Geany. Additionally, there are some options to modify the printed page(s).</p> @@ -3242,7 +3245,7 @@ gtklp or similar programs can be used.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id151" id="plugins" name="plugins">Plugins</a></h2> +<h2><a class="toc-backref" href="#id152" id="plugins" name="plugins">Plugins</a></h2> <p>Plugins are loaded at startup, if the <em>Enable plugin support</em> general preference is set. There is also a command-line option, <tt class="docutils literal"><span class="pre">-p</span></tt>, which prevents plugins being loaded. Plugins are scanned in @@ -3257,7 +3260,7 @@ <p>See also <a class="reference" href="#plugin-documentation">Plugin documentation</a> for information about single plugins which are included in Geany.</p> <div class="section"> -<h3><a class="toc-backref" href="#id152" id="plugin-manager" name="plugin-manager">Plugin Manager</a></h3> +<h3><a class="toc-backref" href="#id153" id="plugin-manager" name="plugin-manager">Plugin manager</a></h3> <p>The Plugin Manager dialog lets you choose which plugins should be loaded at startup. You can also load and unload plugins on the fly using this dialog. Once you click the checkbox for a specific plugin @@ -3268,13 +3271,13 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id153" id="keybindings" name="keybindings">Keybindings</a></h2> +<h2><a class="toc-backref" href="#id154" id="keybindings" name="keybindings">Keybindings</a></h2> <p>Geany supports the default keyboard shortcuts for the Scintilla editing widget. For a list of these commands, see <a class="reference" href="#scintilla-keyboard-commands">Scintilla keyboard commands</a>. The Scintilla keyboard shortcuts will be overridden by any custom keybindings with the same keyboard shortcut.</p> <div class="section"> -<h3><a class="toc-backref" href="#id154" id="switching-documents" name="switching-documents">Switching documents</a></h3> +<h3><a class="toc-backref" href="#id155" id="switching-documents" name="switching-documents">Switching documents</a></h3> <p>There are a few non-configurable bindings to switch between documents, listed below. These can also be overridden by custom keybindings.</p> <table border="1" class="docutils"> @@ -3304,7 +3307,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id155" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> +<h3><a class="toc-backref" href="#id156" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> <p>For all actions listed below you can define your own keybindings. Open the Preferences dialog, select the desired action and click on change. In the resulting dialog you can press the key combination you @@ -3322,7 +3325,7 @@ which are common to many applications are marked with (C) after the shortcut.</p> <div class="section"> -<h4><a class="toc-backref" href="#id156" id="file-keybindings" name="file-keybindings">File keybindings</a></h4> +<h4><a class="toc-backref" href="#id157" id="file-keybindings" name="file-keybindings">File keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3385,7 +3388,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id157" id="editor-keybindings" name="editor-keybindings">Editor keybindings</a></h4> +<h4><a class="toc-backref" href="#id158" id="editor-keybindings" name="editor-keybindings">Editor keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3507,7 +3510,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id158" id="clipboard-keybindings" name="clipboard-keybindings">Clipboard keybindings</a></h4> +<h4><a class="toc-backref" href="#id159" id="clipboard-keybindings" name="clipboard-keybindings">Clipboard keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3547,7 +3550,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id159" id="select-keybindings" name="select-keybindings">Select keybindings</a></h4> +<h4><a class="toc-backref" href="#id160" id="select-keybindings" name="select-keybindings">Select keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3592,7 +3595,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id160" id="insert-keybindings" name="insert-keybindings">Insert keybindings</a></h4> +<h4><a class="toc-backref" href="#id161" id="insert-keybindings" name="insert-keybindings">Insert keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3629,7 +3632,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id161" id="format-keybindings" name="format-keybindings">Format keybindings</a></h4> +<h4><a class="toc-backref" href="#id162" id="format-keybindings" name="format-keybindings">Format keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3717,7 +3720,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id162" id="settings-keybindings" name="settings-keybindings">Settings keybindings</a></h4> +<h4><a class="toc-backref" href="#id163" id="settings-keybindings" name="settings-keybindings">Settings keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3743,7 +3746,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id163" id="search-keybindings" name="search-keybindings">Search keybindings</a></h4> +<h4><a class="toc-backref" href="#id164" id="search-keybindings" name="search-keybindings">Search keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3820,7 +3823,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id164" id="go-to-keybindings" name="go-to-keybindings">Go to keybindings</a></h4> +<h4><a class="toc-backref" href="#id165" id="go-to-keybindings" name="go-to-keybindings">Go to keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3918,7 +3921,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id165" id="view-keybindings" name="view-keybindings">View keybindings</a></h4> +<h4><a class="toc-backref" href="#id166" id="view-keybindings" name="view-keybindings">View keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -3967,7 +3970,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id166" id="focus-keybindings" name="focus-keybindings">Focus keybindings</a></h4> +<h4><a class="toc-backref" href="#id167" id="focus-keybindings" name="focus-keybindings">Focus keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="30%" /> @@ -4030,7 +4033,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id167" id="notebook-tab-keybindings" name="notebook-tab-keybindings">Notebook tab keybindings</a></h4> +<h4><a class="toc-backref" href="#id168" id="notebook-tab-keybindings" name="notebook-tab-keybindings">Notebook tab keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="28%" /> @@ -4084,7 +4087,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id168" id="document-keybindings" name="document-keybindings">Document keybindings</a></h4> +<h4><a class="toc-backref" href="#id169" id="document-keybindings" name="document-keybindings">Document keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -4151,7 +4154,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id169" id="build-keybindings" name="build-keybindings">Build keybindings</a></h4> +<h4><a class="toc-backref" href="#id170" id="build-keybindings" name="build-keybindings">Build keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -4209,7 +4212,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id170" id="tools-keybindings" name="tools-keybindings">Tools keybindings</a></h4> +<h4><a class="toc-backref" href="#id171" id="tools-keybindings" name="tools-keybindings">Tools keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -4231,7 +4234,7 @@ </table> </div> <div class="section"> -<h4><a class="toc-backref" href="#id171" id="help-keybindings" name="help-keybindings">Help keybindings</a></h4> +<h4><a class="toc-backref" href="#id172" id="help-keybindings" name="help-keybindings">Help keybindings</a></h4> <table border="1" class="docutils"> <colgroup> <col width="29%" /> @@ -4256,13 +4259,13 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id172" id="configuration-files" name="configuration-files">Configuration files</a></h1> +<h1><a class="toc-backref" href="#id173" id="configuration-files" name="configuration-files">Configuration files</a></h1> <div class="warning"> <p class="first admonition-title">Warning</p> <p class="last">You must use UTF-8 encoding <em>without BOM</em> for configuration files.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id173" id="configuration-file-paths" name="configuration-file-paths">Configuration file paths</a></h2> +<h2><a class="toc-backref" href="#id174" id="configuration-file-paths" name="configuration-file-paths">Configuration file paths</a></h2> <p>Geany has default configuration files installed for the system and also per-user configuration files.</p> <p>The system files should not normally be edited because they will be @@ -4281,7 +4284,7 @@ Geany-INFO: User config dir: /home/username/.config/geany </pre> <div class="section"> -<h3><a class="toc-backref" href="#id174" id="paths-on-unix-like-systems" name="paths-on-unix-like-systems">Paths on Unix-like systems</a></h3> +<h3><a class="toc-backref" href="#id175" id="paths-on-unix-like-systems" name="paths-on-unix-like-systems">Paths on Unix-like systems</a></h3> <p>The system path is <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>, where <tt class="docutils literal"><span class="pre">$prefix</span></tt> is the path where Geany is installed (see <a class="reference" href="#installation-prefix">Installation prefix</a>).</p> <p>The user configuration directory is normally @@ -4289,7 +4292,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id175" id="tools-menu-items" name="tools-menu-items">Tools menu items</a></h2> +<h2><a class="toc-backref" href="#id176" id="tools-menu-items" name="tools-menu-items">Tools menu items</a></h2> <p>There's a <em>Configuration files</em> submenu in the <em>Tools</em> menu that contains items for some of the available user configuration files. Clicking on one opens it in the editor for you to update. Geany will @@ -4312,7 +4315,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id176" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> +<h2><a class="toc-backref" href="#id177" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> <p>System administrators can add a global configuration file for Geany which will be used when starting Geany and a user configuration file does not exist.</p> @@ -4329,14 +4332,14 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id177" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> +<h2><a class="toc-backref" href="#id178" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> <p>All color definitions and other filetype specific settings are stored in the filetype definition files. Those settings are colors for syntax highlighting, general settings like comment characters or word delimiter characters as well as compiler and linker settings.</p> <p>See also <a class="reference" href="#configuration-file-paths">Configuration file paths</a>.</p> <div class="section"> -<h3><a class="toc-backref" href="#id178" id="filenames" name="filenames">Filenames</a></h3> +<h3><a class="toc-backref" href="#id179" id="filenames" name="filenames">Filenames</a></h3> <p>Each filetype has a corresponding filetype definition file. The format for built-in filetype <cite>Foo</cite> is:</p> <pre class="literal-block"> @@ -4377,7 +4380,7 @@ <p>See the link for details.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id179" id="system-files" name="system-files">System files</a></h3> +<h3><a class="toc-backref" href="#id180" id="system-files" name="system-files">System files</a></h3> <p>The system-wide filetype configuration files can be found in the system configuration path and are called <tt class="docutils literal"><span class="pre">filetypes.$ext</span></tt>, where $ext is the name of the filetype. For every @@ -4391,7 +4394,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id180" id="user-files" name="user-files">User files</a></h3> +<h3><a class="toc-backref" href="#id181" id="user-files" name="user-files">User files</a></h3> <p>To change the settings, copy a file from the system configuration path to the subdirectory <tt class="docutils literal"><span class="pre">filedefs</span></tt> in your user configuration directory. Then you can edit the file and the changes will still be @@ -4401,7 +4404,7 @@ the corresponding system configuration file.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id181" id="custom-filetypes" name="custom-filetypes">Custom filetypes</a></h3> +<h3><a class="toc-backref" href="#id182" id="custom-filetypes" name="custom-filetypes">Custom filetypes</a></h3> <p>At startup Geany looks for <tt class="docutils literal"><span class="pre">filetypes.*.conf</span></tt> files in the system and user filetype paths, adding any filetypes found with the name matching the '<tt class="docutils literal"><span class="pre">*</span></tt>' wildcard - e.g. <tt class="docutils literal"><span class="pre">filetypes.Bar.conf</span></tt>.</p> @@ -4427,7 +4430,7 @@ </ul> <p>See <a class="reference" href="#filetype-configuration">Filetype configuration</a> for details on each setting.</p> <div class="section"> -<h4><a class="toc-backref" href="#id182" id="creating-a-custom-filetype-from-an-existing-filetype" name="creating-a-custom-filetype-from-an-existing-filetype">Creating a custom filetype from an existing filetype</a></h4> +<h4><a class="toc-backref" href="#id183" id="creating-a-custom-filetype-from-an-existing-filetype" name="creating-a-custom-filetype-from-an-existing-filetype">Creating a custom filetype from an existing filetype</a></h4> <p>Because most filetype settings will relate to the syntax highlighting (e.g. styling, keywords, <tt class="docutils literal"><span class="pre">lexer_properties</span></tt> sections), it is best to copy an existing filetype file that uses @@ -4448,11 +4451,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id183" id="filetype-configuration" name="filetype-configuration">Filetype configuration</a></h3> +<h3><a class="toc-backref" href="#id184" id="filetype-configuration" name="filetype-configuration">Filetype configuration</a></h3> <p>As well as the sections listed below, each filetype file can contain -a [build-menu] section as described in <a class="reference" href="#build-menu-section">[build-menu] Section</a>.</p> +a [build-menu] section as described in <a class="reference" href="#build-menu-section">[build-menu] section</a>.</p> <div class="section"> -<h4><a class="toc-backref" href="#id184" id="styling-section" name="styling-section">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id185" id="styling-section" name="styling-section">[styling] section</a></h4> <p>In this section the colors for syntax highlighting are defined. The manual format is:</p> <ul class="simple"> @@ -4468,7 +4471,7 @@ <p>This makes the key style have red foreground text, default background color text and bold emphasis.</p> <div class="section"> -<h5><a class="toc-backref" href="#id185" id="using-a-named-style" name="using-a-named-style">Using a named style</a></h5> +<h5><a class="toc-backref" href="#id186" id="using-a-named-style" name="using-a-named-style">Using a named style</a></h5> <p>The second format uses a <em>named style</em> name to reference a style defined in filetypes.common.</p> <ul class="simple"> @@ -4486,7 +4489,7 @@ Section</a>.</p> </div> <div class="section"> -<h5><a class="toc-backref" href="#id186" id="reading-styles-from-another-filetype" name="reading-styles-from-another-filetype">Reading styles from another filetype</a></h5> +<h5><a class="toc-backref" href="#id187" id="reading-styles-from-another-filetype" name="reading-styles-from-another-filetype">Reading styles from another filetype</a></h5> <p>You can automatically copy all of the styles from another filetype definition file by using the following syntax for the <tt class="docutils literal"><span class="pre">[styling]</span></tt> group:</p> @@ -4505,7 +4508,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id187" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id188" id="keywords-section" name="keywords-section">[keywords] section</a></h4> <p>This section contains keys for different keyword lists specific to the filetype. Some filetypes do not support keywords, so adding a new key will not work. You can only add or remove keywords to/from @@ -4516,7 +4519,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id188" id="lexer-properties-section" name="lexer-properties-section">[lexer_properties] Section</a></h4> +<h4><a class="toc-backref" href="#id189" id="lexer-properties-section" name="lexer-properties-section">[lexer_properties] section</a></h4> <p>Here any special properties for the Scintilla lexer can be set in the format <tt class="docutils literal"><span class="pre">key.name.field=some.value</span></tt>.</p> <p>Properties Geany uses are listed in the system filetype files. To find @@ -4526,7 +4529,7 @@ </pre> </div> <div class="section"> -<h4><a class="toc-backref" href="#id189" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id190" id="settings-section" name="settings-section">[settings] section</a></h4> <dl class="docutils"> <dt>extension</dt> <dd><p class="first">This is the default file extension used when saving files, not @@ -4649,8 +4652,8 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id190" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> -<p>As of Geany 0.19 this section is supplemented by the <a class="reference" href="#build-menu-section">[build-menu] Section</a>. +<h4><a class="toc-backref" href="#id191" id="build-settings-section" name="build-settings-section">[build_settings] section</a></h4> +<p>As of Geany 0.19 this section is supplemented by the <a class="reference" href="#build-menu-section">[build-menu] section</a>. Values that are set in the [build-menu] section will override those in this section.</p> <dl class="docutils"> <dt>error_regex</dt> @@ -4702,7 +4705,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id191" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id192" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> @@ -4717,7 +4720,7 @@ <p class="last">See the <a class="reference" href="#filetype-configuration">Filetype configuration</a> section for how to define styles.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id192" id="named-styles-section" name="named-styles-section">[named_styles] Section</a></h4> +<h4><a class="toc-backref" href="#id193" id="named-styles-section" name="named-styles-section">[named_styles] section</a></h4> <p>Named styles declared here can be used in the [styling] section of any filetypes.* file.</p> <p>For example:</p> @@ -4744,7 +4747,7 @@ schemes menu</a>.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id193" id="id4" name="id4">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id194" id="id4" name="id4">[styling] section</a></h4> <dl class="docutils"> <dt>default</dt> <dd><p class="first">This is the default style. It is used for styling files without a @@ -4928,7 +4931,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id194" id="id5" name="id5">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id195" id="id5" name="id5">[settings] section</a></h4> <dl class="docutils"> <dt>whitespace_chars</dt> <dd><p class="first">Characters to treat as whitespace. These characters are ignored @@ -4942,7 +4945,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id195" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id196" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses to detect @@ -4962,13 +4965,13 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id196" id="preferences-file-format" name="preferences-file-format">Preferences File Format</a></h2> +<h2><a class="toc-backref" href="#id197" id="preferences-file-format" name="preferences-file-format">Preferences file format</a></h2> <p>The user preferences file <tt class="docutils literal"><span class="pre">geany.conf</span></tt> holds settings for all the items configured in the preferences dialog. This file should not be edited while Geany is running as the file will be overwritten when the preferences in Geany are changed or Geany is quit.</p> <div class="section"> -<h3><a class="toc-backref" href="#id197" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h3> +<h3><a class="toc-backref" href="#id198" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h3> <p>There are some rarely used preferences that are not shown in the Preferences dialog. These can be set by editing the preferences file, then restarting Geany. Search for the key name, then edit the value. Example:</p> @@ -5181,7 +5184,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id198" id="build-menu-section" name="build-menu-section">[build-menu] Section</a></h3> +<h3><a class="toc-backref" href="#id199" id="build-menu-section" name="build-menu-section">[build-menu] section</a></h3> <p>The [build-menu] section contains the configuration of the build menu. This section can occur in filetype, preferences and project files and always has the format described here. Different menu items are loaded @@ -5213,19 +5216,19 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id199" id="project-file-format" name="project-file-format">Project File Format</a></h2> +<h2><a class="toc-backref" href="#id200" id="project-file-format" name="project-file-format">Project file format</a></h2> <p>The project file contains project related settings and possibly a record of the current session files.</p> <div class="section"> -<h3><a class="toc-backref" href="#id200" id="build-menu-additions" name="build-menu-additions">[build-menu] Additions</a></h3> +<h3><a class="toc-backref" href="#id201" id="build-menu-additions" name="build-menu-additions">[build-menu] additions</a></h3> <p>The project file also can have extra fields in the [build-menu] section -in addition to those listed in <a class="reference" href="#build-menu-section">[build-menu] Section</a> above.</p> +in addition to those listed in <a class="reference" href="#build-menu-section">[build-menu] section</a> above.</p> <p>When filetype menu items are configured for the project they are stored in the project file.</p> <p>The <tt class="docutils literal"><span class="pre">filetypes</span></tt> entry is a list of the filetypes which exist in the project file.</p> <p>For each filetype the entries for that filetype have the format defined in -<a class="reference" href="#build-menu-section">[build-menu] Section</a> but the key is prefixed by the name of the filetype +<a class="reference" href="#build-menu-section">[build-menu] section</a> but the key is prefixed by the name of the filetype as it appears in the <tt class="docutils literal"><span class="pre">filetypes</span></tt> entry, eg the entry for the label of filetype menu item 0 for the C filetype would be</p> <blockquote> @@ -5233,7 +5236,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id201" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id202" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -5262,7 +5265,7 @@ also force this by selecting <em>Tools->Reload Configuration</em>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id202" id="template-meta-data" name="template-meta-data">Template meta data</a></h3> +<h3><a class="toc-backref" href="#id203" id="template-meta-data" name="template-meta-data">Template meta data</a></h3> <p>Meta data can be used with all templates, but by default user set meta data is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -5271,7 +5274,7 @@ <em>Tools->Reload Configuration</em> or restart Geany after making changes.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id203" id="file-templates" name="file-templates">File templates</a></h3> +<h3><a class="toc-backref" href="#id204" id="file-templates" name="file-templates">File templates</a></h3> <p>File templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -5283,31 +5286,16 @@ wildcard can be placed anywhere, but it's usually put on the first line of the file, followed by a blank line.</p> <div class="section"> -<h4><a class="toc-backref" href="#id204" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> -<p>These are read from <tt class="docutils literal"><span class="pre">templates/files</span></tt> under the <a class="reference" href="#configuration-file-paths">Configuration file -paths</a>.</p> +<h4><a class="toc-backref" href="#id205" id="adding-file-templates" name="adding-file-templates">Adding file templates</a></h4> +<p>File templates are read from <tt class="docutils literal"><span class="pre">templates/files</span></tt> under the +<a class="reference" href="#configuration-file-paths">Configuration file paths</a>.</p> <p>The filetype to use is detected from the template file's extension, if any. For example, creating a file <tt class="docutils literal"><span class="pre">module.c</span></tt> would add a menu item which created a new document with the filetype set to 'C'.</p> <p>The template file is read from disk when the corresponding menu item is clicked.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id205" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">It's recommended to use custom file templates instead.</p> </div> -<p>Filetype template files are read from the <tt class="docutils literal"><span class="pre">~/.config/geany/templates</span></tt> -directory, and are named "filetype." followed by the filetype -name, e.g. "filetype.python", "filetype.sh", etc. If you are -unsure about the filetype name extensions, they are the same as -the filetype configuration file extensions, commonly installed in -<tt class="docutils literal"><span class="pre">/usr/share/geany</span></tt>, with the prefix "filetypes.".</p> -<p>There is also a template file <tt class="docutils literal"><span class="pre">filetype.none</span></tt> which is used when -the New command is used without a filetype. This is empty by default.</p> -</div> -</div> <div class="section"> <h3><a class="toc-backref" href="#id206" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are @@ -5524,8 +5512,7 @@ </tr> <tr><td>fileheader</td> <td>The file header template. This wildcard -will only be replaced in filetype -templates.</td> +will only be replaced in file templates.</td> <td>snippets, file templates.</td> </tr> </tbody> @@ -6553,7 +6540,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2011-03-29 13:57 UTC. +Generated on: 2011-04-01 16:25 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: branches/sm/doc/geany.txt =================================================================== --- branches/sm/doc/geany.txt 2011-05-21 08:53:29 UTC (rev 5806) +++ branches/sm/doc/geany.txt 2011-05-21 08:54:44 UTC (rev 5807) @@ -161,7 +161,7 @@ % ./waf install -Waf Cache +Waf cache ````````` The Waf build system has a nice and interesting feature which can help to avoid @@ -184,7 +184,7 @@ More information about the Waf cache feature are available at http://code.google.com/p/waf/wiki/CacheObjectFiles. -Cleaning the Cache +Cleaning the cache ****************** You should be careful about the size of the cache directory as it may grow rapidly over time. @@ -552,12 +552,9 @@ The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab -order. Its is not alphabetical as shown in the documents list +order. It is not alphabetical as shown in the documents list (regardless of whether or not editor tabs are visible). -The tabs can be positioned at the top, bottom, left, or right of the -main editing window, by a selection in the interface preferences. - See the `Notebook tab keybindings`_ section for useful shortcuts including for Most-Recently-Used document switching. @@ -771,7 +768,7 @@ The default settings can be overridden per-document using the Document menu. They can also be overridden by projects - see -`Project Management`_. +`Project management`_. The indent mode for the current document is shown on the status bar as follows: @@ -883,11 +880,12 @@ of the program's standard error will be printed on Geany's standard output. +If there is no selection, the whole current line is used instead. + To add a custom command, use the *Send Selection to->Set Custom -Commands* menu item. Click on *Add* to get a new text entry and type -the command. You can also specify some command line options. To -delete a command, just clear the text entry and press OK. It will be -deleted automatically. +Commands* menu item. Click on *Add* to get a new item and type the +command. You can also specify some command line options. Empty +commands are not saved. Normal shell quoting is supported, so you can do things like: @@ -1647,7 +1645,7 @@ upgrading Geany. -C Ignore tags +C ignore.tags ^^^^^^^^^^^^^ You can ignore certain tags for C-based languages if they would lead @@ -1859,6 +1857,17 @@ Message window Change the font used for the message window area. +Miscellaneous +````````````` + +Show status bar + Show the status bar at the bottom of the main window. It gives information about + the file you are editing like the line and column you are on, whether any + modifications were done, the file encoding, the filetype and other information. + +Interface Notebook tab preferences +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Editor tabs ``````````` @@ -1897,18 +1906,10 @@ Set the positioning of the message window's notebook tabs to the right, left, top, or bottom of the message window. -Miscellaneous -````````````` -Show status bar - Show the status bar at the bottom of the main window. It gives information about - the file you are editing like the line and column you are on, whether any - modifications were done, the file encoding, the filetype and other information. +Interface Toolbar preferences +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Toolbar preferences -^^^^^^^^^^^^^^^^^^^ - Affects the main toolbar underneath the menu bar. .. image:: ./images/pref_dialog_toolbar.png @@ -2462,10 +2463,10 @@ like a Python console (e.g. ipython). Use this with care. -Project Management +Project management ------------------ -Project Management is optional in Geany. Currently it can be used for: +Project management is optional in Geany. Currently it can be used for: * Storing and opening session files on a project basis. * Overriding default settings with project equivalents. @@ -2486,7 +2487,7 @@ The project menu items are detailed below. -New Project +New project ^^^^^^^^^^^ To create a new project, fill in the *Name* field. By default this @@ -2499,7 +2500,7 @@ structure contained in it. -Project Properties +Project properties ^^^^^^^^^^^^^^^^^^ You can set an optional description for the project. Currently it's @@ -2513,7 +2514,7 @@ `Indentation`_ settings. -Open Project +Open project ^^^^^^^^^^^^ The Open command displays a standard file chooser, starting in @@ -2524,7 +2525,7 @@ open files and open the session files associated with the project. -Close Project +Close project ^^^^^^^^^^^^^ Project file settings are saved when the project is closed. @@ -2533,7 +2534,7 @@ session files and open any previously closed default session files. -Build Menu +Build menu ---------- After editing code with Geany, the next step is to compile, link, build, interpret, run etc. As Geany supports many languages each with a different @@ -2574,7 +2575,7 @@ preferences`_. -Default Build Menu Items +Default build menu items ^^^^^^^^^^^^^^^^^^^^^^^^ Depending on the current file's filetype, the default Build menu will contain the following items: @@ -2642,12 +2643,12 @@ the current file, using the filename for 'current_file'. It is useful for building just the current file without building the whole project. -Next Error +Next error `````````` The next error item will move to the next detected error in the file. -Previous Error +Previous error `````````````` The previous error item will move to the previous detected error in the file. @@ -2693,7 +2694,7 @@ tab in the terminal field. -Set Build Commands +Set build commands `````````````````` By default Compile, Build and Execute are fairly basic commands. You @@ -2703,7 +2704,7 @@ compiler, any library names and paths for the linker, and any arguments you want to use when running Execute. -Build Menu Configuration +Build menu configuration ^^^^^^^^^^^^^^^^^^^^^^^^ The build menu has considerable flexibility and configurability, allowing @@ -2734,7 +2735,7 @@ * Show the build menu commands dialog. The maximum numbers of items in each of the configurable groups can be -configured when Geany starts using hidden settings (see `Preferences File Format`_). +configured when Geany starts using hidden settings (see `Preferences file format`_). Even though the maximum number of items may have been increased, only those menu items that have values configured are shown in the menu. @@ -2803,10 +2804,10 @@ * (Execute, Project File) and (Execute, Preferences) - the project independent execute and preferences independent execute commands can only be set by hand - editing the appropriate file, see `Preferences File Format`_ and `Project File - Format`_. + editing the appropriate file, see `Preferences file format`_ and `Project file + format`_. -Build Menu Commands Dialog +Build menu commands dialog ^^^^^^^^^^^^^^^^^^^^^^^^^^ Most of the configuration of the build menu is done through the Build Menu @@ -2848,7 +2849,7 @@ To hide lower priority menu items without having anything show in the menu configure with a nothing in the label but at least one character in the command. -Substitutions in Commands and Working Directories +Substitutions in commands and working directories ````````````````````````````````````````````````` The first occurence of each of the following character sequences in each of the @@ -2868,7 +2869,7 @@ and even checked into and out of version control without having to re-configure the build menu. -Build Menu Keyboard Shortcuts +Build menu keyboard shortcuts ````````````````````````````` Keyboard shortcuts can be defined for the first two filetype menu items, the first three @@ -2885,7 +2886,7 @@ The configurable Build Menu capability was introduced in Geany 0.19 and required a new section to be added to the configuration files (See -`Preferences File Format`_). Geany will still load older format project, +`Preferences file format`_). Geany will still load older format project, preferences and filetype file settings and will attempt to map them into the new configuration format. There is not a simple clean mapping between the formats. The mapping used produces the most sensible results for the majority of cases. @@ -2974,7 +2975,7 @@ See also `Plugin documentation`_ for information about single plugins which are included in Geany. -Plugin Manager +Plugin manager ^^^^^^^^^^^^^^ The Plugin Manager dialog lets you choose which plugins should be loaded at startup. You can also load and unload plugins on the @@ -3711,9 +3712,9 @@ ^^^^^^^^^^^^^^^^^^^^^^ As well as the sections listed below, each filetype file can contain -a [build-menu] section as described in `[build-menu] Section`_. +a [build-menu] section as described in `[build-menu] section`_. -[styling] Section +[styling] section ````````````````` @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5806] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5806 http://geany.svn.sourceforge.net/geany/?rev=5806&view=rev Author: statc Date: 2011-05-21 08:53:29 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5641..5660) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/doc/pluginsymbols.c branches/sm/plugins/filebrowser.c branches/sm/plugins/geanyfunctions.h branches/sm/plugins/saveactions.c branches/sm/plugins/splitwindow.c branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/keybindings.c branches/sm/src/keybindings.h branches/sm/src/main.c branches/sm/src/plugindata.h branches/sm/src/pluginprivate.h branches/sm/src/plugins.c branches/sm/src/pluginutils.c branches/sm/src/pluginutils.h branches/sm/src/sciwrappers.c Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:52:12 UTC (rev 5805) +++ branches/sm/ChangeLog 2011-05-21 08:53:29 UTC (rev 5806) @@ -1,3 +1,62 @@ +2011-03-31 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/filebrowser.c: + Make 'Hide object files' preference configurable with file + extensions. + + +2011-03-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Use STYLE_MAX instead of 127 for editor_set_font(). This fixes a + crash in the Split Window plugin when changing filetype (patch by + Matthew Brush, thanks; fixes #3255968). + * plugins/splitwindow.c: + Update styles when the filetype changes (based on patch by + Matthew Brush, thanks). + * plugins/saveactions.c: + Fix Instant Save preferences combo box filetype order. + * plugins/filebrowser.c: + Remove confusing macro CHECK_READ_SETTING(). + + +2011-03-30 Colomban Wendling <colomban(at)geany(dot)org> + + * src/plugindata.h, src/pluginprivate.h, src/plugins.c, + src/pluginutils.c, src/pluginutils.h plugins/geanyfunctions.h: + Add plugin_idle_add(), plugin_timeout_add() and + plugin_timeout_add_seconds() to the plugin API. These are + convenience wrappers to ensure the added timeouts are properly + removed when unloading the plugin, preventing possible crashes. + * plugins/splitwindow.c: + Use new plugin_idle_add(), preventing an unlikely crash. + * doc/pluginsymbols.c, src/sciwrappers.c: + Fix a few Doxygen warnings. + * plugins/saveactions.c: + Properly use 0 as the invalid timeout source ID. + + +2011-03-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Add #reading-styles-from-another-filetype subsection, based on + patch by Matthew Brush (thanks). + * doc/geany.txt, doc/geany.html: + Add #filenames subsection for filetype definition files explaining + the filename extensions and special cases. + * src/plugindata.h, src/filetypes.c, src/filetypes.h, src/plugins.c, + src/main.c, plugins/geanyfunctions.h: + Add filetypes_get_sorted_by_name() to API. + Fix --ft-names sorting to print in name order, not title order. + + +2011-03-28 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/document.h, src/editor.c, src/keybindings.c: + Don't update parent WorkObjects when updating one in real-time. This + should fix some performance issues if a WorkObject has many parents. + + 2011-03-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/makefile.win32, src/main.c, src/Makefile.am, configure.ac, @@ -4,16 +63,20 @@ wscript: Initialize GLib's Gthread system early at startup in case any plugins need it. + * src/keybindings.c, src/keybindings.h, src/plugindata.h, + doc/geany.txt, doc/geany.html: + Add new keybinding 'Remove Markers and Error Indicators'. 2011-03-26 Colomban Wendling <colomban(at)geany(dot)org> * src/sidebar.c: - Fix the sidebar popup menu to properly use the currently selected item - rather than the previous one. - Also change the hack used for the selection to be updated in the input - handlers to call the GtkTreeView's handler manually rather than doing - the actual job in IDLE callbacks for the TreeView's handler to have run. + Fix the sidebar popup menu to properly use the currently selected + item rather than the previous one. + Also change the hack used for the selection to be updated in the + input handlers to call the GtkTreeView's handler manually rather than + doing the actual job in IDLE callbacks for the TreeView's handler to + have run. * doc/geany.html, doc/geany.txt, geany.glade, src/document.c, src/editor.h, src/interface.c, src/interface.h, src/keyfile.c, src/project.c: @@ -60,8 +123,8 @@ * plugins/filebrowser.c, plugins/saveactions.c, src/callbacks.c, src/dialogs.c, src/document.c, src/document.h, src/editor.c, src/encodings.c, src/filetypes.c, src/highlighting.c, src/log.c, - src/main.c, src/plugins.c, src/printing.c, src/project.c, src/search.c, - src/socket.c, src/toolbar.c, src/utils.c, src/utils.h: + src/main.c, src/plugins.c, src/printing.c, src/project.c, + src/search.c, src/socket.c, src/toolbar.c, src/utils.c, src/utils.h: Improve usage of G_LIKELY() and G_UNLIKELY() macros. @@ -94,15 +157,16 @@ 2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> * src/callbacks.c: - Create a new undo action when inserting templates, making sure the user - can undo the template insertion without also undoing a previous action. + Create a new undo action when inserting templates, making sure the + user can undo the template insertion without also undoing a previous + action. 2011-03-18 Colomban Wendling <colomban(at)geany(dot)org> * src/document.c, src/encodings.c, src/encodings.h: - Move document encoding conversion with BOM support to encodings.[ch] as - encodings_convert_to_utf8_auto(). + Move document encoding conversion with BOM support to encodings.[ch] + as encodings_convert_to_utf8_auto(). * src/templates.c: Properly convert template files to UTF-8 on loading, fixing encoding issues if templates files are not encoded in UTF-8. @@ -193,9 +257,10 @@ 2011-03-06 Colomban Wendling <colomban(at)geany(dot)org> * src/symbols.c: - When sorting tags by line, also sort by scope if line is the same, avoiding - wrong sorting if a parent tag is on the same line than its children, and one - of it's children would be sorted before alphabetically (closes #3193982). + When sorting tags by line, also sort by scope if line is the same, + avoiding wrong sorting if a parent tag is on the same line than its + children, and one of it's children would be sorted before + alphabetically (closes #3193982). 2011-03-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> @@ -220,16 +285,17 @@ * configure.ac, wscript, makefile.win32, src/Makefile.am, src/makefile.win32, tagmanager/Makefile.am, tagmanager/c.c, tagmanager/entry.c, tagmanager/entry.h, tagmanager/fortran.c, - tagmanager/get.c, tagmanager/get.h, tagmanager/js.c, tagmanager/lregex.c, - tagmanager/makefile.win32, tagmanager/parse.c, tagmanager/read.c, - tagmanager/read.h, tagmanager/sort.c, tagmanager/sql.c, - tagmanager/strlist.c, tagmanager/mio/*: + tagmanager/get.c, tagmanager/get.h, tagmanager/js.c, + tagmanager/lregex.c, tagmanager/makefile.win32, tagmanager/parse.c, + tagmanager/read.c, tagmanager/read.h, tagmanager/sort.c, + tagmanager/sql.c, tagmanager/strlist.c, tagmanager/mio/*: Move most of TagManager's I/O to MIO. * src/document.c: Enable in-memory tag parsing. - * geany.glade, src/editor.c, src/editor.h, src/interface.c, src/keyfile.c: - Add possibility to update symbol list in IDLE time, enabled by default - using a minimal delay of 250ms. + * geany.glade, src/editor.c, src/editor.h, src/interface.c, + src/keyfile.c: + Add possibility to update symbol list in IDLE time, enabled by + default using a minimal delay of 250ms. * src/symbols.c: Improve implementation of hide_empty_rows() to do all in one shot. * tagmanager/include/tm_tag.h, tagmanager/tm_project.c, Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:52:12 UTC (rev 5805) +++ branches/sm/doc/geany.html 2011-05-21 08:53:29 UTC (rev 5806) @@ -3,10 +3,10 @@ <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.7: 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="$Date$" /> +<meta name="date" content="2011-03-29" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>$Date$</td></tr> +<td>2011-03-29</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.21</td></tr> </tbody> @@ -149,370 +149,372 @@ License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code -of this program, and also in the chapter <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> -<div class="contents topic" id="contents"> -<p class="topic-title first">Contents</p> +of this program, and also in the chapter <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> +<div class="contents topic"> +<p class="topic-title first"><a id="contents" name="contents">Contents</a></p> <ul class="simple"> -<li><a class="reference internal" href="#introduction" id="id7">Introduction</a><ul> -<li><a class="reference internal" href="#about-geany" id="id8">About Geany</a></li> -<li><a class="reference internal" href="#where-to-get-it" id="id9">Where to get it</a></li> -<li><a class="reference internal" href="#license" id="id10">License</a></li> -<li><a class="reference internal" href="#about-this-document" id="id11">About this document</a></li> +<li><a class="reference" href="#introduction" id="id7" name="id7">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id8" name="id8">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id9" name="id9">Where to get it</a></li> +<li><a class="reference" href="#license" id="id10" name="id10">License</a></li> +<li><a class="reference" href="#about-this-document" id="id11" name="id11">About this document</a></li> </ul> </li> -<li><a class="reference internal" href="#installation" id="id12">Installation</a><ul> -<li><a class="reference internal" href="#requirements" id="id13">Requirements</a></li> -<li><a class="reference internal" href="#binary-packages" id="id14">Binary packages</a></li> -<li><a class="reference internal" href="#source-compilation" id="id15">Source compilation</a><ul> -<li><a class="reference internal" href="#autotools-based-build-system" id="id16">Autotools based build system</a></li> -<li><a class="reference internal" href="#waf-based-build-system" id="id17">Waf based build system</a><ul> -<li><a class="reference internal" href="#waf-cache" id="id18">Waf Cache</a><ul> -<li><a class="reference internal" href="#cleaning-the-cache" id="id19">Cleaning the Cache</a></li> +<li><a class="reference" href="#installation" id="id12" name="id12">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id13" name="id13">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id14" name="id14">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id15" name="id15">Source compilation</a><ul> +<li><a class="reference" href="#autotools-based-build-system" id="id16" name="id16">Autotools based build system</a></li> +<li><a class="reference" href="#waf-based-build-system" id="id17" name="id17">Waf based build system</a><ul> +<li><a class="reference" href="#waf-cache" id="id18" name="id18">Waf Cache</a><ul> +<li><a class="reference" href="#cleaning-the-cache" id="id19" name="id19">Cleaning the Cache</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#custom-installation" id="id20">Custom installation</a></li> -<li><a class="reference internal" href="#dynamic-linking-loader-support-and-vte" id="id21">Dynamic linking loader support and VTE</a></li> -<li><a class="reference internal" href="#build-problems" id="id22">Build problems</a></li> +<li><a class="reference" href="#custom-installation" id="id20" name="id20">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support-and-vte" id="id21" name="id21">Dynamic linking loader support and VTE</a></li> +<li><a class="reference" href="#build-problems" id="id22" name="id22">Build problems</a></li> </ul> </li> -<li><a class="reference internal" href="#installation-prefix" id="id23">Installation prefix</a></li> +<li><a class="reference" href="#installation-prefix" id="id23" name="id23">Installation prefix</a></li> </ul> </li> -<li><a class="reference internal" href="#usage" id="id24">Usage</a><ul> -<li><a class="reference internal" href="#getting-started" id="id25">Getting started</a></li> -<li><a class="reference internal" href="#the-geany-workspace" id="id26">The Geany workspace</a></li> -<li><a class="reference internal" href="#command-line-options" id="id27">Command line options</a></li> -<li><a class="reference internal" href="#general" id="id28">General</a><ul> -<li><a class="reference internal" href="#startup" id="id29">Startup</a></li> -<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id30">Opening files from the command-line in a running instance</a></li> -<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id31">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id32">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id24" name="id24">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id25" name="id25">Getting started</a></li> +<li><a class="reference" href="#the-geany-workspace" id="id26" name="id26">The Geany workspace</a></li> +<li><a class="reference" href="#command-line-options" id="id27" name="id27">Command line options</a></li> +<li><a class="reference" href="#general" id="id28" name="id28">General</a><ul> +<li><a class="reference" href="#startup" id="id29" name="id29">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id30" name="id30">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id31" name="id31">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id32" name="id32">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference internal" href="#documents" id="id33">Documents</a><ul> -<li><a class="reference internal" href="#switching-between-documents" id="id34">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id33" name="id33">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id34" name="id34">Switching between documents</a></li> </ul> </li> -<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id35">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference internal" href="#using-character-sets" id="id36">Using character sets</a></li> -<li><a class="reference internal" href="#in-file-encoding-specification" id="id37">In-file encoding specification</a></li> -<li><a class="reference internal" href="#special-encoding-none" id="id38">Special encoding "None"</a></li> -<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id39">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id35" name="id35">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id36" name="id36">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id37" name="id37">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id38" name="id38">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id39" name="id39">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference internal" href="#editing" id="id40">Editing</a><ul> -<li><a class="reference internal" href="#folding" id="id41">Folding</a></li> -<li><a class="reference internal" href="#column-mode-editing-rectangular-selections" id="id42">Column mode editing (rectangular selections)</a></li> -<li><a class="reference internal" href="#drag-and-drop-of-text" id="id43">Drag and drop of text</a></li> -<li><a class="reference internal" href="#indentation" id="id44">Indentation</a><ul> -<li><a class="reference internal" href="#applying-new-indentation-settings" id="id45">Applying new indentation settings</a></li> -<li><a class="reference internal" href="#detecting-indent-type" id="id46">Detecting indent type</a></li> +<li><a class="reference" href="#editing" id="id40" name="id40">Editing</a><ul> +<li><a class="reference" href="#folding" id="id41" name="id41">Folding</a></li> +<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id42" name="id42">Column mode editing (rectangular selections)</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id43" name="id43">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id44" name="id44">Indentation</a><ul> +<li><a class="reference" href="#applying-new-indentation-settings" id="id45" name="id45">Applying new indentation settings</a></li> +<li><a class="reference" href="#detecting-indent-type" id="id46" name="id46">Detecting indent type</a></li> </ul> </li> -<li><a class="reference internal" href="#auto-indentation" id="id47">Auto-indentation</a></li> -<li><a class="reference internal" href="#bookmarks" id="id48">Bookmarks</a></li> -<li><a class="reference internal" href="#code-navigation-history" id="id49">Code navigation history</a></li> -<li><a class="reference internal" href="#sending-text-through-custom-commands" id="id50">Sending text through custom commands</a></li> -<li><a class="reference internal" href="#context-actions" id="id51">Context actions</a></li> -<li><a class="reference internal" href="#autocompletion" id="id52">Autocompletion</a><ul> -<li><a class="reference internal" href="#word-part-completion" id="id53">Word part completion</a></li> -<li><a class="reference internal" href="#scope-autocompletion" id="id54">Scope autocompletion</a></li> +<li><a class="reference" href="#auto-indentation" id="id47" name="id47">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id48" name="id48">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id49" name="id49">Code navigation history</a></li> +<li><a class="reference" href="#sending-text-through-custom-commands" id="id50" name="id50">Sending text through custom commands</a></li> +<li><a class="reference" href="#context-actions" id="id51" name="id51">Context actions</a></li> +<li><a class="reference" href="#autocompletion" id="id52" name="id52">Autocompletion</a><ul> +<li><a class="reference" href="#word-part-completion" id="id53" name="id53">Word part completion</a></li> +<li><a class="reference" href="#scope-autocompletion" id="id54" name="id54">Scope autocompletion</a></li> </ul> </li> -<li><a class="reference internal" href="#user-definable-snippets" id="id55">User-definable snippets</a><ul> -<li><a class="reference internal" href="#snippet-keybindings" id="id56">Snippet keybindings</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id55" name="id55">User-definable snippets</a><ul> +<li><a class="reference" href="#snippet-keybindings" id="id56" name="id56">Snippet keybindings</a></li> </ul> </li> -<li><a class="reference internal" href="#inserting-unicode-characters" id="id57">Inserting Unicode characters</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id57" name="id57">Inserting Unicode characters</a></li> </ul> </li> -<li><a class="reference internal" href="#search-replace-and-go-to" id="id58">Search, replace and go to</a><ul> -<li><a class="reference internal" href="#toolbar-entries" id="id59">Toolbar entries</a><ul> -<li><a class="reference internal" href="#search-bar" id="id60">Search bar</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id58" name="id58">Search, replace and go to</a><ul> +<li><a class="reference" href="#toolbar-entries" id="id59" name="id59">Toolbar entries</a><ul> +<li><a class="reference" href="#search-bar" id="id60" name="id60">Search bar</a></li> </ul> </li> -<li><a class="reference internal" href="#find" id="id61">Find</a><ul> -<li><a class="reference internal" href="#matching-options" id="id62">Matching options</a></li> -<li><a class="reference internal" href="#find-all" id="id63">Find all</a></li> -<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id64">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#find" id="id61" name="id61">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id62" name="id62">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id63" name="id63">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id64" name="id64">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference internal" href="#find-selection" id="id65">Find selection</a></li> -<li><a class="reference internal" href="#find-usage" id="id66">Find usage</a></li> -<li><a class="reference internal" href="#find-in-files" id="id67">Find in files</a><ul> -<li><a class="reference internal" href="#filtering-out-version-control-files" id="id68">Filtering out version control files</a></li> +<li><a class="reference" href="#find-selection" id="id65" name="id65">Find selection</a></li> +<li><a class="reference" href="#find-usage" id="id66" name="id66">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id67" name="id67">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id68" name="id68">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference internal" href="#replace" id="id69">Replace</a><ul> -<li><a class="reference internal" href="#replace-all" id="id70">Replace all</a></li> +<li><a class="reference" href="#replace" id="id69" name="id69">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id70" name="id70">Replace all</a></li> </ul> </li> -<li><a class="reference internal" href="#go-to-tag-definition" id="id71">Go to tag definition</a></li> -<li><a class="reference internal" href="#go-to-tag-declaration" id="id72">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-line" id="id73">Go to line</a></li> -<li><a class="reference internal" href="#regular-expressions" id="id74">Regular expressions</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id71" name="id71">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id72" name="id72">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id73" name="id73">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id74" name="id74">Regular expressions</a></li> </ul> </li> -<li><a class="reference internal" href="#view-menu" id="id75">View menu</a><ul> -<li><a class="reference internal" href="#color-schemes-menu" id="id76">Color schemes menu</a></li> +<li><a class="reference" href="#view-menu" id="id75" name="id75">View menu</a><ul> +<li><a class="reference" href="#color-schemes-menu" id="id76" name="id76">Color schemes menu</a></li> </ul> </li> -<li><a class="reference internal" href="#tags" id="id77">Tags</a><ul> -<li><a class="reference internal" href="#workspace-tags" id="id78">Workspace tags</a></li> -<li><a class="reference internal" href="#global-tags" id="id79">Global tags</a><ul> -<li><a class="reference internal" href="#default-global-tags-files" id="id80">Default global tags files</a></li> -<li><a class="reference internal" href="#global-tags-file-format" id="id81">Global tags file format</a></li> -<li><a class="reference internal" href="#generating-a-global-tags-file" id="id82">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id77" name="id77">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id78" name="id78">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id79" name="id79">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id80" name="id80">Default global tags files</a></li> +<li><a class="reference" href="#global-tags-file-format" id="id81" name="id81">Global tags file format</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id82" name="id82">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference internal" href="#c-ignore-tags" id="id83">C Ignore tags</a></li> +<li><a class="reference" href="#c-ignore-tags" id="id83" name="id83">C Ignore tags</a></li> </ul> </li> -<li><a class="reference internal" href="#preferences" id="id84">Preferences</a><ul> -<li><a class="reference internal" href="#general-startup-preferences" id="id85">General Startup preferences</a><ul> -<li><a class="reference internal" href="#id1" id="id86">Startup</a></li> -<li><a class="reference internal" href="#shutdown" id="id87">Shutdown</a></li> -<li><a class="reference internal" href="#paths" id="id88">Paths</a></li> +<li><a class="reference" href="#preferences" id="id84" name="id84">Preferences</a><ul> +<li><a class="reference" href="#general-startup-preferences" id="id85" name="id85">General Startup preferences</a><ul> +<li><a class="reference" href="#id1" id="id86" name="id86">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id87" name="id87">Shutdown</a></li> +<li><a class="reference" href="#paths" id="id88" name="id88">Paths</a></li> </ul> </li> -<li><a class="reference internal" href="#general-miscellaneous-preferences" id="id89">General Miscellaneous preferences</a><ul> -<li><a class="reference internal" href="#miscellaneous" id="id90">Miscellaneous</a></li> -<li><a class="reference internal" href="#search" id="id91">Search</a></li> -<li><a class="reference internal" href="#projects" id="id92">Projects</a></li> +<li><a class="reference" href="#general-miscellaneous-preferences" id="id89" name="id89">General Miscellaneous preferences</a><ul> +<li><a class="reference" href="#miscellaneous" id="id90" name="id90">Miscellaneous</a></li> +<li><a class="reference" href="#search" id="id91" name="id91">Search</a></li> +<li><a class="reference" href="#projects" id="id92" name="id92">Projects</a></li> </ul> </li> -<li><a class="reference internal" href="#interface-preferences" id="id93">Interface preferences</a><ul> -<li><a class="reference internal" href="#sidebar" id="id94">Sidebar</a></li> -<li><a class="reference internal" href="#fonts" id="id95">Fonts</a></li> -<li><a class="reference internal" href="#editor-tabs" id="id96">Editor tabs</a></li> -<li><a class="reference internal" href="#tab-positions" id="id97">Tab positions</a></li> -<li><a class="reference internal" href="#id2" id="id98">Miscellaneous</a></li> +<li><a class="reference" href="#interface-preferences" id="id93" name="id93">Interface preferences</a><ul> +<li><a class="reference" href="#sidebar" id="id94" name="id94">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id95" name="id95">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id96" name="id96">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id97" name="id97">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id98" name="id98">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#toolbar-preferences" id="id99">Toolbar preferences</a><ul> -<li><a class="reference internal" href="#toolbar" id="id100">Toolbar</a></li> -<li><a class="reference internal" href="#appearance" id="id101">Appearance</a></li> +<li><a class="reference" href="#toolbar-preferences" id="id99" name="id99">Toolbar preferences</a><ul> +<li><a class="reference" href="#toolbar" id="id100" name="id100">Toolbar</a></li> +<li><a class="reference" href="#appearance" id="id101" name="id101">Appearance</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-features-preferences" id="id102">Editor Features preferences</a><ul> -<li><a class="reference internal" href="#features" id="id103">Features</a></li> +<li><a class="reference" href="#editor-features-preferences" id="id102" name="id102">Editor Features preferences</a><ul> +<li><a class="reference" href="#features" id="id103" name="id103">Features</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-indentation-preferences" id="id104">Editor Indentation preferences</a><ul> -<li><a class="reference internal" href="#indentation-group" id="id105">Indentation group</a></li> +<li><a class="reference" href="#editor-indentation-preferences" id="id104" name="id104">Editor Indentation preferences</a><ul> +<li><a class="reference" href="#indentation-group" id="id105" name="id105">Indentation group</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-completions-preferences" id="id106">Editor Completions preferences</a><ul> -<li><a class="reference internal" href="#completions" id="id107">Completions</a></li> -<li><a class="reference internal" href="#auto-close-quotes-and-brackets" id="id108">Auto-close quotes and brackets</a></li> +<li><a class="reference" href="#editor-completions-preferences" id="id106" name="id106">Editor Completions preferences</a><ul> +<li><a class="reference" href="#completions" id="id107" name="id107">Completions</a></li> +<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id108" name="id108">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-display-preferences" id="id109">Editor Display preferences</a><ul> -<li><a class="reference internal" href="#display" id="id110">Display</a></li> -<li><a class="reference internal" href="#long-line-marker" id="id111">Long line marker</a></li> -<li><a class="reference internal" href="#virtual-spaces" id="id112">Virtual spaces</a></li> +<li><a class="reference" href="#editor-display-preferences" id="id109" name="id109">Editor Display preferences</a><ul> +<li><a class="reference" href="#display" id="id110" name="id110">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id111" name="id111">Long line marker</a></li> +<li><a class="reference" href="#virtual-spaces" id="id112" name="id112">Virtual spaces</a></li> </ul> </li> -<li><a class="reference internal" href="#files-preferences" id="id113">Files preferences</a><ul> -<li><a class="reference internal" href="#new-files" id="id114">New files</a></li> -<li><a class="reference internal" href="#saving-files" id="id115">Saving files</a></li> -<li><a class="reference internal" href="#id3" id="id116">Miscellaneous</a></li> +<li><a class="reference" href="#files-preferences" id="id113" name="id113">Files preferences</a><ul> +<li><a class="reference" href="#new-files" id="id114" name="id114">New files</a></li> +<li><a class="reference" href="#saving-files" id="id115" name="id115">Saving files</a></li> +<li><a class="reference" href="#id3" id="id116" name="id116">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#tools-preferences" id="id117">Tools preferences</a><ul> -<li><a class="reference internal" href="#tool-paths" id="id118">Tool paths</a></li> -<li><a class="reference internal" href="#commands" id="id119">Commands</a></li> +<li><a class="reference" href="#tools-preferences" id="id117" name="id117">Tools preferences</a><ul> +<li><a class="reference" href="#tool-paths" id="id118" name="id118">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id119" name="id119">Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#template-preferences" id="id120">Template preferences</a><ul> -<li><a class="reference internal" href="#template-data" id="id121">Template data</a></li> +<li><a class="reference" href="#template-preferences" id="id120" name="id120">Template preferences</a><ul> +<li><a class="reference" href="#template-data" id="id121" name="id121">Template data</a></li> </ul> </li> -<li><a class="reference internal" href="#keybinding-preferences" id="id122">Keybinding preferences</a></li> -<li><a class="reference internal" href="#printing-preferences" id="id123">Printing preferences</a></li> -<li><a class="reference internal" href="#terminal-vte-preferences" id="id124">Terminal (VTE) preferences</a><ul> -<li><a class="reference internal" href="#terminal-widget" id="id125">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-preferences" id="id122" name="id122">Keybinding preferences</a></li> +<li><a class="reference" href="#printing-preferences" id="id123" name="id123">Printing preferences</a></li> +<li><a class="reference" href="#terminal-vte-preferences" id="id124" name="id124">Terminal (VTE) preferences</a><ul> +<li><a class="reference" href="#terminal-widget" id="id125" name="id125">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#project-management" id="id126">Project Management</a><ul> -<li><a class="reference internal" href="#new-project" id="id127">New Project</a></li> -<li><a class="reference internal" href="#project-properties" id="id128">Project Properties</a></li> -<li><a class="reference internal" href="#open-project" id="id129">Open Project</a></li> -<li><a class="reference internal" href="#close-project" id="id130">Close Project</a></li> +<li><a class="reference" href="#project-management" id="id126" name="id126">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id127" name="id127">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id128" name="id128">Project Properties</a></li> +<li><a class="reference" href="#open-project" id="id129" name="id129">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id130" name="id130">Close Project</a></li> </ul> </li> -<li><a class="reference internal" href="#build-menu" id="id131">Build Menu</a><ul> -<li><a class="reference internal" href="#indicators" id="id132">Indicators</a></li> -<li><a class="reference internal" href="#default-build-menu-items" id="id133">Default Build Menu Items</a><ul> -<li><a class="reference internal" href="#compile" id="id134">Compile</a></li> -<li><a class="reference internal" href="#build" id="id135">Build</a></li> -<li><a class="reference internal" href="#make" id="id136">Make</a></li> -<li><a class="reference internal" href="#make-custom-target" id="id137">Make custom target</a></li> -<li><a class="reference internal" href="#make-object" id="id138">Make object</a></li> -<li><a class="reference internal" href="#next-error" id="id139">Next Error</a></li> -<li><a class="reference internal" href="#previous-error" id="id140">Previous Error</a></li> -<li><a class="reference internal" href="#execute" id="id141">Execute</a></li> -<li><a class="reference internal" href="#stopping-running-processes" id="id142">Stopping running processes</a><ul> -<li><a class="reference internal" href="#terminal-emulators" id="id143">Terminal emulators</a></li> +<li><a class="reference" href="#build-menu" id="id131" name="id131">Build Menu</a><ul> +<li><a class="reference" href="#indicators" id="id132" name="id132">Indicators</a></li> +<li><a class="reference" href="#default-build-menu-items" id="id133" name="id133">Default Build Menu Items</a><ul> +<li><a class="reference" href="#compile" id="id134" name="id134">Compile</a></li> +<li><a class="reference" href="#build" id="id135" name="id135">Build</a></li> +<li><a class="reference" href="#make" id="id136" name="id136">Make</a></li> +<li><a class="reference" href="#make-custom-target" id="id137" name="id137">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id138" name="id138">Make object</a></li> +<li><a class="reference" href="#next-error" id="id139" name="id139">Next Error</a></li> +<li><a class="reference" href="#previous-error" id="id140" name="id140">Previous Error</a></li> +<li><a class="reference" href="#execute" id="id141" name="id141">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id142" name="id142">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id143" name="id143">Terminal emulators</a></li> </ul> </li> -<li><a class="reference internal" href="#set-build-commands" id="id144">Set Build Commands</a></li> +<li><a class="reference" href="#set-build-commands" id="id144" name="id144">Set Build Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#build-menu-configuration" id="id145">Build Menu Configuration</a></li> -<li><a class="reference internal" href="#build-menu-commands-dialog" id="id146">Build Menu Commands Dialog</a><ul> -<li><a class="reference internal" href="#substitutions-in-commands-and-working-directories" id="id147">Substitutions in Commands and Working Directories</a></li> -<li><a class="reference internal" href="#build-menu-keyboard-shortcuts" id="id148">Build Menu Keyboard Shortcuts</a></li> -<li><a class="reference internal" href="#old-settings" id="id149">Old settings</a></li> +<li><a class="reference" href="#build-menu-configuration" id="id145" name="id145">Build Menu Configuration</a></li> +<li><a class="reference" href="#build-menu-commands-dialog" id="id146" name="id146">Build Menu Commands Dialog</a><ul> +<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id147" name="id147">Substitutions in Commands and Working Directories</a></li> +<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id148" name="id148">Build Menu Keyboard Shortcuts</a></li> +<li><a class="reference" href="#old-settings" id="id149" name="id149">Old settings</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#printing-support" id="id150">Printing support</a></li> -<li><a class="reference internal" href="#plugins" id="id151">Plugins</a><ul> -<li><a class="reference internal" href="#plugin-manager" id="id152">Plugin Manager</a></li> +<li><a class="reference" href="#printing-support" id="id150" name="id150">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id151" name="id151">Plugins</a><ul> +<li><a class="reference" href="#plugin-manager" id="id152" name="id152">Plugin Manager</a></li> </ul> </li> -<li><a class="reference internal" href="#keybindings" id="id153">Keybindings</a><ul> -<li><a class="reference internal" href="#switching-documents" id="id154">Switching documents</a></li> -<li><a class="reference internal" href="#configurable-keybindings" id="id155">Configurable keybindings</a><ul> -<li><a class="reference internal" href="#file-keybindings" id="id156">File keybindings</a></li> -<li><a class="reference internal" href="#editor-keybindings" id="id157">Editor keybindings</a></li> -<li><a class="reference internal" href="#clipboard-keybindings" id="id158">Clipboard keybindings</a></li> -<li><a class="reference internal" href="#select-keybindings" id="id159">Select keybindings</a></li> -<li><a class="reference internal" href="#insert-keybindings" id="id160">Insert keybindings</a></li> -<li><a class="reference internal" href="#format-keybindings" id="id161">Format keybindings</a></li> -<li><a class="reference internal" href="#settings-keybindings" id="id162">Settings keybindings</a></li> -<li><a class="reference internal" href="#search-keybindings" id="id163">Search keybindings</a></li> -<li><a class="reference internal" href="#go-to-keybindings" id="id164">Go to keybindings</a></li> -<li><a class="reference internal" href="#view-keybindings" id="id165">View keybindings</a></li> -<li><a class="reference internal" href="#focus-keybindings" id="id166">Focus keybindings</a></li> -<li><a class="reference internal" href="#notebook-tab-keybindings" id="id167">Notebook tab keybindings</a></li> -<li><a class="reference internal" href="#document-keybindings" id="id168">Document keybindings</a></li> -<li><a class="reference internal" href="#build-keybindings" id="id169">Build keybindings</a></li> -<li><a class="reference internal" href="#tools-keybindings" id="id170">Tools keybindings</a></li> -<li><a class="reference internal" href="#help-keybindings" id="id171">Help keybindings</a></li> +<li><a class="reference" href="#keybindings" id="id153" name="id153">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id154" name="id154">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id155" name="id155">Configurable keybindings</a><ul> +<li><a class="reference" href="#file-keybindings" id="id156" name="id156">File keybindings</a></li> +<li><a class="reference" href="#editor-keybindings" id="id157" name="id157">Editor keybindings</a></li> +<li><a class="reference" href="#clipboard-keybindings" id="id158" name="id158">Clipboard keybindings</a></li> +<li><a class="reference" href="#select-keybindings" id="id159" name="id159">Select keybindings</a></li> +<li><a class="reference" href="#insert-keybindings" id="id160" name="id160">Insert keybindings</a></li> +<li><a class="reference" href="#format-keybindings" id="id161" name="id161">Format keybindings</a></li> +<li><a class="reference" href="#settings-keybindings" id="id162" name="id162">Settings keybindings</a></li> +<li><a class="reference" href="#search-keybindings" id="id163" name="id163">Search keybindings</a></li> +<li><a class="reference" href="#go-to-keybindings" id="id164" name="id164">Go to keybindings</a></li> +<li><a class="reference" href="#view-keybindings" id="id165" name="id165">View keybindings</a></li> +<li><a class="reference" href="#focus-keybindings" id="id166" name="id166">Focus keybindings</a></li> +<li><a class="reference" href="#notebook-tab-keybindings" id="id167" name="id167">Notebook tab keybindings</a></li> +<li><a class="reference" href="#document-keybindings" id="id168" name="id168">Document keybindings</a></li> +<li><a class="reference" href="#build-keybindings" id="id169" name="id169">Build keybindings</a></li> +<li><a class="reference" href="#tools-keybindings" id="id170" name="id170">Tools keybindings</a></li> +<li><a class="reference" href="#help-keybindings" id="id171" name="id171">Help keybindings</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#configuration-files" id="id172">Configuration files</a><ul> -<li><a class="reference internal" href="#configuration-file-paths" id="id173">Configuration file paths</a><ul> -<li><a class="reference internal" href="#paths-on-unix-like-systems" id="id174">Paths on Unix-like systems</a></li> +<li><a class="reference" href="#configuration-files" id="id172" name="id172">Configuration files</a><ul> +<li><a class="reference" href="#configuration-file-paths" id="id173" name="id173">Configuration file paths</a><ul> +<li><a class="reference" href="#paths-on-unix-like-systems" id="id174" name="id174">Paths on Unix-like systems</a></li> </ul> </li> -<li><a class="reference internal" href="#tools-menu-items" id="id175">Tools menu items</a></li> -<li><a class="reference internal" href="#global-configuration-file" id="id176">Global configuration file</a></li> -<li><a class="reference internal" href="#filetype-definition-files" id="id177">Filetype definition files</a><ul> -<li><a class="reference internal" href="#system-files" id="id178">System files</a></li> -<li><a class="reference internal" href="#user-files" id="id179">User files</a></li> -<li><a class="reference internal" href="#custom-filetypes" id="id180">Custom filetypes</a><ul> -<li><a class="reference internal" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id181">Creating a custom filetype from an existing filetype</a></li> +<li><a class="reference" href="#tools-menu-items" id="id175" name="id175">Tools menu items</a></li> +<li><a class="reference" href="#global-configuration-file" id="id176" name="id176">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id177" name="id177">Filetype definition files</a><ul> +<li><a class="reference" href="#filenames" id="id178" name="id178">Filenames</a></li> +<li><a class="reference" href="#system-files" id="id179" name="id179">System files</a></li> +<li><a class="reference" href="#user-files" id="id180" name="id180">User files</a></li> +<li><a class="reference" href="#custom-filetypes" id="id181" name="id181">Custom filetypes</a><ul> +<li><a class="reference" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id182" name="id182">Creating a custom filetype from an existing filetype</a></li> </ul> </li> -<li><a class="reference internal" href="#filetype-configuration" id="id182">Filetype configuration</a><ul> -<li><a class="reference internal" href="#styling-section" id="id183">[styling] Section</a><ul> -<li><a class="reference internal" href="#using-a-named-style" id="id184">Using a named style</a></li> +<li><a class="reference" href="#filetype-configuration" id="id183" name="id183">Filetype configuration</a><ul> +<li><a class="reference" href="#styling-section" id="id184" name="id184">[styling] Section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id185" name="id185">Using a named style</a></li> +<li><a class="reference" href="#reading-styles-from-another-filetype" id="id186" name="id186">Reading styles from another filetype</a></li> </ul> </li> -<li><a class="reference internal" href="#keywords-section" id="id185">[keywords] Section</a></li> -<li><a class="reference internal" href="#lexer-properties-section" id="id186">[lexer_properties] Section</a></li> -<li><a class="reference internal" href="#settings-section" id="id187">[settings] Section</a></li> -<li><a class="reference internal" href="#build-settings-section" id="id188">[build_settings] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id187" name="id187">[keywords] Section</a></li> +<li><a class="reference" href="#lexer-properties-section" id="id188" name="id188">[lexer_properties] Section</a></li> +<li><a class="reference" href="#settings-section" id="id189" name="id189">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id190" name="id190">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#special-file-filetypes-common" id="id189">Special file filetypes.common</a><ul> -<li><a class="reference internal" href="#named-styles-section" id="id190">[named_styles] Section</a></li> -<li><a class="reference internal" href="#id4" id="id191">[styling] Section</a></li> -<li><a class="reference internal" href="#id5" id="id192">[settings] Section</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id191" name="id191">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id192" name="id192">[named_styles] Section</a></li> +<li><a class="reference" href="#id4" id="id193" name="id193">[styling] Section</a></li> +<li><a class="reference" href="#id5" id="id194" name="id194">[settings] Section</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#filetype-extensions" id="id193">Filetype extensions</a></li> -<li><a class="reference internal" href="#preferences-file-format" id="id194">Preferences File Format</a><ul> -<li><a class="reference internal" href="#hidden-preferences" id="id195">Hidden preferences</a></li> -<li><a class="reference internal" href="#build-menu-section" id="id196">[build-menu] Section</a></li> +<li><a class="reference" href="#filetype-extensions" id="id195" name="id195">Filetype extensions</a></li> +<li><a class="reference" href="#preferences-file-format" id="id196" name="id196">Preferences File Format</a><ul> +<li><a class="reference" href="#hidden-preferences" id="id197" name="id197">Hidden preferences</a></li> +<li><a class="reference" href="#build-menu-section" id="id198" name="id198">[build-menu] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#project-file-format" id="id197">Project File Format</a><ul> -<li><a class="reference internal" href="#build-menu-additions" id="id198">[build-menu] Additions</a></li> +<li><a class="reference" href="#project-file-format" id="id199" name="id199">Project File Format</a><ul> +<li><a class="reference" href="#build-menu-additions" id="id200" name="id200">[build-menu] Additions</a></li> </ul> </li> -<li><a class="reference internal" href="#templates" id="id199">Templates</a><ul> -<li><a class="reference internal" href="#template-meta-data" id="id200">Template meta data</a></li> -<li><a class="reference internal" href="#file-templates" id="id201">File templates</a><ul> -<li><a class="reference internal" href="#custom-file-templates" id="id202">Custom file templates</a></li> -<li><a class="reference internal" href="#filetype-templates" id="id203">Filetype templates</a></li> +<li><a class="reference" href="#templates" id="id201" name="id201">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id202" name="id202">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id203" name="id203">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id204" name="id204">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id205" name="id205">Filetype templates</a></li> </ul> </li> -<li><a class="reference internal" href="#customizing-templates" id="id204">Customizing templates</a><ul> -<li><a class="reference internal" href="#template-wildcards" id="id205">Template wildcards</a><ul> -<li><a class="reference internal" href="#special-command-wildcard" id="id206">Special {command:} wildcard</a></li> +<li><a class="reference" href="#customizing-templates" id="id206" name="id206">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id207" name="id207">Template wildcards</a><ul> +<li><a class="reference" href="#special-command-wildcard" id="id208" name="id208">Special {command:} wildcard</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#customizing-the-toolbar" id="id207">Customizing the toolbar</a><ul> -<li><a class="reference internal" href="#manually-editing-the-toolbar-layout" id="id208">Manually editing the toolbar layout</a></li> -<li><a class="reference internal" href="#available-toolbar-elements" id="id209">Available toolbar elements</a></li> +<li><a class="reference" href="#customizing-the-toolbar" id="id209" name="id209">Customizing the toolbar</a><ul> +<li><a class="reference" href="#manually-editing-the-toolbar-layout" id="id210" name="id210">Manually editing the toolbar layout</a></li> +<li><a class="reference" href="#available-toolbar-elements" id="id211" name="id211">Available toolbar elements</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#plugin-documentation" id="id210">Plugin documentation</a><ul> -<li><a class="reference internal" href="#html-characters" id="id211">HTML Characters</a><ul> -<li><a class="reference internal" href="#insert-entity-dialog" id="id212">Insert entity dialog</a></li> -<li><a class="reference internal" href="#replace-special-chars-by-its-entity" id="id213">Replace special chars by its entity</a><ul> -<li><a class="reference internal" href="#at-typing-time" id="id214">At typing time</a></li> -<li><a class="reference internal" href="#bulk-replacement" id="id215">Bulk replacement</a></li> +<li><a class="reference" href="#plugin-documentation" id="id212" name="id212">Plugin documentation</a><ul> +<li><a class="reference" href="#html-characters" id="id213" name="id213">HTML Characters</a><ul> +<li><a class="reference" href="#insert-entity-dialog" id="id214" name="id214">Insert entity dialog</a></li> +<li><a class="reference" href="#replace-special-chars-by-its-entity" id="id215" name="id215">Replace special chars by its entity</a><ul> +<li><a class="reference" href="#at-typing-time" id="id216" name="id216">At typing time</a></li> +<li><a class="reference" href="#bulk-replacement" id="id217" name="id217">Bulk replacement</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#save-actions" id="id216">Save Actions</a><ul> -<li><a class="reference internal" href="#instant-save" id="id217">Instant Save</a></li> -<li><a class="reference internal" href="#backup-copy" id="id218">Backup Copy</a></li> +<li><a class="reference" href="#save-actions" id="id218" name="id218">Save Actions</a><ul> +<li><a class="reference" href="#instant-save" id="id219" name="id219">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id220" name="id220">Backup Copy</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#contributing-to-this-document" id="id219">Contributing to this document</a></li> -<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id220">Scintilla keyboard commands</a><ul> -<li><a class="reference internal" href="#keyboard-commands" id="id221">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id221" name="id221">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id222" name="id222">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id223" name="id223">Keyboard commands</a></li> </ul> </li> -<li><a class="reference internal" href="#tips-and-tricks" id="id222">Tips and tricks</a><ul> -<li><a class="reference internal" href="#document-notebook" id="id223">Document notebook</a></li> -<li><a class="reference internal" href="#editor" id="id224">Editor</a></li> -<li><a class="reference internal" href="#interface" id="id225">Interface</a></li> -<li><a class="reference internal" href="#gtk-related" id="id226">GTK-related</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id224" name="id224">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id225" name="id225">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id226" name="id226">Editor</a></li> +<li><a class="reference" href="#interface" id="id227" name="id227">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id228" name="id228">GTK-related</a></li> </ul> </li> -<li><a class="reference internal" href="#compile-time-options" id="id227">Compile-time options</a><ul> -<li><a class="reference internal" href="#src-geany-h" id="id228">src/geany.h</a></li> -<li><a class="reference internal" href="#project-h" id="id229">project.h</a></li> -<li><a class="reference internal" href="#editor-h" id="id230">editor.h</a></li> -<li><a class="reference internal" href="#keyfile-c" id="id231">keyfile.c</a></li> -<li><a class="reference internal" href="#build-c" id="id232">build.c</a></li> +<li><a class="reference" href="#compile-time-options" id="id229" name="id229">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id230" name="id230">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id231" name="id231">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id232" name="id232">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id233" name="id233">keyfile.c</a></li> +<li><a class="reference" href="#build-c" id="id234" name="id234">build.c</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id233">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id234">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id235" name="id235">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id236" name="id236">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section" id="introduction"> -<h1><a class="toc-backref" href="#id7">Introduction</a></h1> -<div class="section" id="about-geany"> -<h2><a class="toc-backref" href="#id8">About Geany</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id7" id="introduction" name="introduction">Introduction</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id8" id="about-geany" name="about-geany">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies on other packages. Another goal was to be as independent @@ -535,56 +537,56 @@ <li>Plugin interface</li> </ul> </div> -<div class="section" id="where-to-get-it"> -<h2><a class="toc-backref" href="#id9">Where to get it</a></h2> -<p>You can obtain Geany from <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from +<div class="section"> +<h2><a class="toc-backref" href="#id9" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distribution. For a list of available packages, please see -<a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +<a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="license"> -<h2><a class="toc-backref" href="#id10">License</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id10" id="license" name="license">License</a></h2> <p>Geany is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source -code of this program and in the chapter, <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> +code of this program and in the chapter, <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> <p>The included Scintilla library (found in the subdirectory -<tt class="docutils literal">scintilla/</tt>) has its own license, which can be found in the chapter, -<a class="reference internal" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> +<tt class="docutils literal"><span class="pre">scintilla/</span></tt>) has its own license, which can be found in the chapter, +<a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> -<div class="section" id="about-this-document"> -<h2><a class="toc-backref" href="#id11">About this document</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id11" id="about-this-document" name="about-this-document">About this document</a></h2> <p>This documentation is available in HTML and text formats. -The latest version can always be found at <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a>.</p> -<p>If you want to contribute to it, see <a class="reference internal" href="#contributing-to-this-document">Contributing to this document</a>.</p> +The latest version can always be found at <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a>.</p> +<p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> -<div class="section" id="installation"> -<h1><a class="toc-backref" href="#id12">Installation</a></h1> -<div class="section" id="requirements"> -<h2><a class="toc-backref" href="#id13">Requirements</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id12" id="installation" name="installation">Installation</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id13" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.8.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer from the website which bundles these libraries.</p> </div> -<div class="section" id="binary-packages"> -<h2><a class="toc-backref" href="#id14">Binary packages</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id14" id="binary-packages" name="binary-packages">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe -incomplete list see <a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="source-compilation"> -<h2><a class="toc-backref" href="#id15">Source compilation</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id15" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>Compiling Geany is quite easy. To do so, you need the GTK (>= 2.8.0) libraries and header files. You also need the Pango, GLib and ATK libraries and header files. -All these files are available at <a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often +All these files are available at <a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C and C++ compiler. The GNU versions of these tools are recommended.</p> -<div class="section" id="autotools-based-build-system"> -<h3><a class="toc-backref" href="#id16">Autotools based build system</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id16" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> <p>The Autotools based build system is very mature and has been well tested. To use it, you just need the Make tool, preferably GNU Make.</p> <p>Then run the following commands:</p> @@ -597,8 +599,8 @@ % make install </pre> </div> -<div class="section" id="waf-based-build-system"> -<h3><a class="toc-backref" href="#id17">Waf based build system</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id17" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> <p>The Waf build system is still quite young and under heavy development but already in a usable state. In contrast to the Autotools system, Waf needs Python. So before using Waf, you need to install Python on your system. @@ -606,7 +608,7 @@ build process might be a bit faster. Especially when you use the Waf cache feature for repetitive builds (e.g. when changing only a few source files to test something) will become much faster since Waf will cache and re-use the -unchanged built files and only compile the changed code again. See <a class="reference internal" href="#waf-cache">Waf Cache</a> for details. +unchanged built files and only compile the changed code again. See <a class="reference" href="#waf-cache">Waf Cache</a> for details. To build Geany with Waf as run:</p> <pre class="literal-block"> $ ./waf configure @@ -616,13 +618,13 @@ <pre class="literal-block"> % ./waf install </pre> -<div class="section" id="waf-cache"> -<h4><a class="toc-backref" href="#id18">Waf Cache</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id18" id="waf-cache" name="waf-cache">Waf Cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help to avoid a lot of unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something in Geany. Waf is able to store and retrieve the object files from a cache. This cache is declared -using the environment variable <tt class="docutils literal">WAFCACHE</tt>. +using the environment variable <tt class="docutils literal"><span class="pre">WAFCACHE</span></tt>. A possible location of the cache directory could be <tt class="docutils literal"><span class="pre">~/.cache/waf</span></tt>. In order to make use of this, you first need to create this directory:</p> <pre class="literal-block"> @@ -633,11 +635,11 @@ <pre class="literal-block"> export WAFCACHE=/home/username/.cache/waf </pre> -<p>Remember to replace <tt class="docutils literal">username</tt> with your actual username.</p> +<p>Remember to replace <tt class="docutils literal"><span class="pre">username</span></tt> with your actual username.</p> <p>More information about the Waf cache feature are available at -<a class="reference external" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> -<div class="section" id="cleaning-the-cache"> -<h5><a class="toc-backref" href="#id19">Cleaning the Cache</a></h5> +<a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> +<div class="section"> +<h5><a class="toc-backref" href="#id19" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> <p>You should be careful about the size of the cache directory as it may grow rapidly over time. Waf doesn't do any cleaning or other house-keeping of the cache yet, so you need to keep it @@ -648,12 +650,12 @@ $ find /home/username/.cache/waf -mtime +14 -exec rm {} \; </pre> <p>This will delete all files in the cache directory which are older than 14 days.</p> -<p>For details about the <tt class="docutils literal">find</tt> command and its options, check its manual page.</p> +<p>For details about the <tt class="docutils literal"><span class="pre">find</span></tt> command and its options, check its manual page.</p> </div> </div> </div> -<div class="section" id="custom-installation"> -<h3><a class="toc-backref" href="#id20">Custom installation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id20" id="custom-installation" name="custom-installation">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -667,44 +669,44 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference internal" href="#compile-time-options">Compile-time options</a>.</li> +<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> </ul> </div> -<div class="section" id="dynamic-linking-loader-support-and-vte"> -<h3><a class="toc-backref" href="#id21">Dynamic linking loader support and VTE</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id21" id="dynamic-linking-loader-support-and-vte" name="dynamic-linking-loader-support-and-vte">Dynamic linking loader support and VTE</a></h3> <p>In the case that your system lacks dynamic linking loader support, you -probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal">configure</tt> +probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader -support for automatically loading <tt class="docutils literal">libvte.so.4</tt> if available.</p> +support for automatically loading <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> -<div class="section" id="build-problems"> -<h3><a class="toc-backref" href="#id22">Build problems</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id22" id="build-problems" name="build-problems">Build problems</a></h3> <p>If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one the authors. Sometimes you might need to ask for specific help from your distribution.</p> </div> </div> -<div class="section" id="installation-prefix"> -<h2><a class="toc-backref" href="#id23">Installation prefix</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id23" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> <p>If you want to find Geany's system files after installation you may want to know the installation prefix.</p> <p>Pass the <tt class="docutils literal"><span class="pre">--print-prefix</span></tt> option to Geany to check this - see -<a class="reference internal" href="#command-line-options">Command line options</a>. The first path is the prefix.</p> -<p>On Unix-like systems this is commonly <tt class="docutils literal">/usr</tt> if you installed from -a binary package, or <tt class="docutils literal">/usr/local</tt> if you build from source.</p> +<a class="reference" href="#command-line-options">Command line options</a>. The first path is the prefix.</p> +<p>On Unix-like systems this is commonly <tt class="docutils literal"><span class="pre">/usr</span></tt> if you installed from +a binary package, or <tt class="docutils literal"><span class="pre">/usr/local</span></tt> if you build from source.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">Editing system files is not necessary as you can use the per-user configuration files instead, which don't need root -permissions. See <a class="reference internal" href="#configuration-files">Configuration files</a>.</p> +permissions. See <a class="reference" href="#configuration-files">Configuration files</a>.</p> </div> </div> </div> -<div class="section" id="usage"> -<h1><a class="toc-backref" href="#id24">Usage</a></h1> -<div class="section" id="getting-started"> -<h2><a class="toc-backref" href="#id25">Getting started</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id24" id="usage" name="usage">Usage</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id25" id="getting-started" name="getting-started">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -720,8 +722,8 @@ </li> </ul> </div> -<div class="section" id="the-geany-workspace"> -<h2><a class="toc-backref" href="#id26">The Geany workspace</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id26" id="the-geany-workspace" name="the-geany-workspace">The Geany workspace</a></h2> <p>The Geany window is shown in the following figure:</p> <img alt="./images/main_window.png" src="./images/main_window.png" /> <p>The workspace has the following parts:</p> @@ -744,15 +746,15 @@ </li> <li>A status bar</li> </ul> -<p>Most of these can be configured in the <a class="reference internal" href="#interface-preferences">Interface preferences</a>, the -<a class="reference internal" href="#view-menu">View menu</a>, or the popup menu for the relevant area.</p> +<p>Most of these can be configured in the <a class="reference" href="#interface-preferences">Interface preferences</a>, the +<a class="reference" href="#view-menu">View menu</a>, or the popup menu for the relevant area.</p> <p>Additional tabs may be added to the sidebar and message window by plugins.</p> <p>The position of the tabs can be selected in the interface preferences.</p> <p>The sizes of the sidebar and message window can be adjusted by dragging the dividers.</p> </div> -<div class="section" id="command-line-options"> -<h2><a class="toc-backref" href="#id27">Command line options</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id27" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="9%" /> @@ -781,7 +783,7 @@ <td>--config=directory_name</td> <td>Use an alternate configuration directory. The default configuration directory is <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt> and that -is where <tt class="docutils literal">geany.conf</tt> and other configuration files +is where <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files reside.</td> </tr> <tr><td><em>none</em></td> @@ -792,7 +794,7 @@ <tr><td>-g</td> <td>--generate-tags</td> <td>Generate a global tags file (see -<a class="reference internal" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> </tr> <tr><td>-P</td> <td>--no-preprocessing</td> @@ -848,7 +850,7 @@ <td>--no-terminal</td> <td>Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget -at startup. If you do not have <tt class="docutils literal">libvte.so.4</tt> installed, +at startup. If you do not have <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -866,7 +868,7 @@ <td>--vte-lib</td> <td>Specify explicitly the path including filename or only the filename to the VTE library, e.g. -<tt class="docutils literal">/usr/lib/libvte.so</tt> or <tt class="docutils literal">libvte.so</tt>. This option is +<tt class="docutils literal"><span class="pre">/usr/lib/libvte.so</span></tt> or <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. This option is only needed when the auto-detection does not work. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -905,13 +907,13 @@ <p>Geany supports all generic GTK options, a list is available on the help screen.</p> </div> -<div class="section" id="general"> -<h2><a class="toc-backref" href="#id28">General</a></h2> -<div class="section" id="startup"> -<h3><a class="toc-backref" href="#id29">Startup</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id28" id="general" name="general">General</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id29" id="startup" name="startup">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog -(see <a class="reference internal" href="#general-startup-preferences">General Startup preferences</a>). If you specify some +(see <a class="reference" href="#general-startup-preferences">General Startup preferences</a>). If you specify some files on the command line, only these files will be opened, but you can find the files from the last session in the file menu under the "Recent files" item. By default this contains the last 10 recently @@ -922,8 +924,8 @@ do not specify any filenames on the command-line, or disable opening files in a running instance using the appropriate command line option.</p> </div> -<div class="section" id="opening-files-from-the-command-line-in-a-running-instance"> -<h3><a class="toc-backref" href="#id30">Opening files from the command-line in a running instance</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id30" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> <p>Geany detects if there is an an instance of itself already running and opens files from the command-line in that instance. So, Geany can be used to view and edit files by opening them from other programs @@ -932,22 +934,22 @@ <pre class="literal-block"> geany some_file.foo:55:4 </pre> -<p>This would open the file <tt class="docutils literal">some_file.foo</tt> with the cursor on line 55, +<p>This would open the file <tt class="docutils literal"><span class="pre">some_file.foo</span></tt> with the cursor on line 55, column 4.</p> <p>If you do not like this for some reason, you can disable using the first instance by using the appropriate command line option -- see the section -called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> +called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> -<div class="section" id="virtual-terminal-emulator-widget-vte"> -<h3><a class="toc-backref" href="#id31">Virtual terminal emulator widget (VTE)</a></h3> -<p>If you have installed <tt class="docutils literal">libvte.so</tt> on your system, it is loaded +<div class="section"> +<h3><a class="toc-backref" href="#id31" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> on your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> -<p>If Geany cannot find any <tt class="docutils literal">libvte.so</tt> at startup, the terminal widget +<p>If Geany cannot find any <tt class="docutils literal"><span class="pre">libvte.so</span></tt> at startup, the terminal widget will not be loaded. So there is no need to install the package containing this file in order to run Geany. Additionally, you can disable the use of the terminal widget by command line option, for more information -see the section called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> +see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> <p>You can use this terminal (from now on called VTE) much as you would a terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -964,26 +966,26 @@ you can use the argument <tt class="docutils literal"><span class="pre">--login</span></tt>.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">Geany tries to load <tt class="docutils literal">libvte.so</tt>. If this fails, it tries to load +<p class="last">Geany tries to load <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. If this fails, it tries to load some other filenames. If this fails too, you should check whether you installed libvte correctly. Again note, Geany will run without this library.</p> </div> <p>It could be, that the library is called something else than -<tt class="docutils literal">libvte.so</tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal">libvte.so.8</tt>). If so +<tt class="docutils literal"><span class="pre">libvte.so</span></tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal"><span class="pre">libvte.so.8</span></tt>). If so please set a link to the correct file (as root):</p> <pre class="literal-block"> # ln -s /usr/lib/libvte.so.X /usr/lib/libvte.so </pre> <p>Obviously, you have to adjust the paths and set X to the number of your -<tt class="docutils literal">libvte.so</tt>.</p> +<tt class="docutils literal"><span class="pre">libvte.so</span></tt>.</p> <p>You can also specify the filename of the VTE library to use on the command -line (see the section called <a class="reference internal" href="#command-line-options">Command line options</a>) or at compile time +line (see the section called <a class="reference" href="#command-line-options">Command line options</a>) or at compile time by specifying the command line option <tt class="docutils literal"><span class="pre">--with-vte-module-path</span></tt> to ./configure.</p> </div> -<div class="section" id="defining-own-widget-styles-using-gtkrc-2-0"> -<h3><a class="toc-backref" href="#id32">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id32" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -1023,10 +1025,10 @@ </pre> </div> </div> -<div class="section" id="documents"> -<h2><a class="toc-backref" href="#id33">Documents</a></h2> -<div class="section" id="switching-between-documents"> -<h3><a class="toc-backref" href="#id34">Switching between documents</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id33" id="documents" name="documents">Documents</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id34" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -1034,14 +1036,14 @@ (regardless of whether or not editor tabs are visible).</p> <p>The tabs can be positioned at the top, bottom, left, or right of the main editing window, by a selection in the interface preferences.</p> -<p>See the <a class="reference internal" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful +<p>See the <a class="reference" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful shortcuts including for Most-Recently-Used document switching.</p> </div> </div> -<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> -<h2><a class="toc-backref" href="#id35">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section" id="using-character-sets"> -<h3><a class="toc-backref" href="#id36">Using character sets</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id35" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id36" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets, and even convert a file from one character set to another. To do this, @@ -1087,8 +1089,8 @@ </li> </ul> </div> -<div class="section" id="in-file-encoding-specification"> -<h3><a class="toc-backref" href="#id37">In-file encoding specification</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id37" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -1115,7 +1117,7 @@ correctly the next time.</p> <p>Since Geany 0.15 you can also use lines which match the regular expression used to find the encoding string: -<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> ]*</tt></p> +<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> <span class="pre">]*</span></tt></p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">These specifications must be in the first 512 bytes of the file. @@ -1130,8 +1132,8 @@ # coding: ISO-8859-15 </pre> </div> -<div class="section" id="special-encoding-none"> -<h3><a class="toc-backref" href="#id38">Special encoding "None"</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id38" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which uses no encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -1140,10 +1142,10 @@ of the first NULL-byte. Using this encoding opens the file as it is without any character conversion.</p> </div> -<div class="section" id="unicode-byte-order-mark-bom"> -<h3><a class="toc-backref" href="#id39">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id39" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects a Unicode Byte Order Mark (see -<a class="reference external" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, +<a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in a Unicode encoding. The Byte Order Mark helps to detect the encoding of a file, e.g. whether it is UTF-16LE or UTF-16BE and so on. On Unix-like systems @@ -1163,10 +1165,10 @@ </div> </div> </div> -<div class="section" id="editing"> -<h2><a class="toc-backref" href="#id40">Editing</a></h2> -<div class="section" id="folding"> -<h3><a class="toc-backref" href="#id41">Folding</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id40" id="editing" name="editing">Editing</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id41" id="folding" name="folding">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -1180,7 +1182,7 @@ <div class="note"> <p class="first admonition-title">Note</p> <p class="last">You can customize the folding icon and line styles - see the -filetypes.common <a class="reference internal" href="#folding-settings">Folding Settings</a>.</p> +filetypes.common <a class="reference" href="#folding-settings">Folding Settings</a>.</p> </div> <p>If you don't like it or don't need it at all, you can simply disable folding support completely in the preferences dialog.</p> @@ -1195,8 +1197,8 @@ children of a fold point" option is enabled, pressing Shift will disable it for this click and vice versa.</p> </div> -<div class="section" id="column-mode-editing-rectangular-selections"> -<h3><a class="toc-backref" href="#id42">Column mode editing (rectangular selections)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id42" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control and Shift keys (or Control and Alt if it doesn't work) while @@ -1205,23 +1207,23 @@ this selection and the modifications will be done for every line in the selection.</p> </div> -<div class="section" id="drag-and-drop-of-text"> -<h3><a class="toc-backref" href="#id43">Drag and drop of text</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id43" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will copy the text instead. This behaviour was changed in Geany 0.11 - before the selected text was copied to the new position.</p> </div> -<div class="section" id="indentation"> -<h3><a class="toc-backref" href="#id44">Indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id44" id="indentation" name="indentation">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character, multiple spaces or a combination of both. The default indent -settings are set in <a class="reference internal" href="#editor-indentation-preferences">Editor Indentation preferences</a> (see the link +settings are set in <a class="reference" href="#editor-indentation-preferences">Editor Indentation preferences</a> (see the link for more information).</p> <p>The default settings can be overridden per-document using the Document menu. They can also be overridden by projects - see -<a class="reference internal" href="#project-management">Project Management</a>.</p> +<a class="reference" href="#project-management">Project Management</a>.</p> <p>The indent mode for the current document is shown on the status bar as follows:</p> <dl class="docutils"> @@ -1233,21 +1235,21 @@ <dd>Indent with tabs and spaces, depending on how much indentation is on a line.</dd> </dl> -<div class="section" id="applying-new-indentation-settings"> -<h4><a class="toc-backref" href="#id45">Applying new indentation settings</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id45" id="applying-new-indentation-settings" name="applying-new-indentation-settings">Applying new indentation settings</a></h4> <p>After changing the default settings you may wish to apply the new settings to every document in the current session. To do this use the <em>Project->Apply Default Indentation</em> menu item.</p> </div> -<div class="section" id="detecting-indent-type"> -<h4><a class="toc-backref" href="#id46">Detecting indent type</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id46" id="detecting-indent-type" name="detecting-indent-type">Detecting indent type</a></h4> <p>The <em>Detect from file</em> indentation preference can be used to scan each file as it's opened and set the indent type based on how many lines start with a tab vs. 2 or more spaces.</p> </div> </div> -<div class="section" id="auto-indentation"> -<h3><a class="toc-backref" href="#id47">Auto-indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id47" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -1268,10 +1270,10 @@ </dl> <p>There is also XML-tag auto-indentation. This is enabled when the mode is more than just Basic, and is also controlled by a filetype -setting - see <a class="reference internal" href="#xml-indent-tags">xml_indent_tags</a>.</p> +setting - see <a class="reference" href="#xml-indent-tags">xml_indent_tags</a>.</p> </div> -<div class="section" id="bookmarks"> -<h3><a class="toc-backref" href="#id48">Bookmarks</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id48" id="bookmarks" name="bookmarks">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -1288,14 +1290,14 @@ (Ctrl-PgUp/PgDn and Ctrl-Tab) provides a particularly fast way to navigate around multiple files.</p> </div> -<div class="section" id="code-navigation-history"> -<h3><a class="toc-backref" href="#id49">Code navigation history</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id49" id="code-navigation-history" name="code-navigation-history">Code navigation history</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> <ul class="simple"> -<li><a class="reference internal" href="#go-to-tag-declaration">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li> <li>Symbol list items</li> <li>Build errors</li> <li>Message items</li> @@ -1307,8 +1309,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section" id="sending-text-through-custom-commands"> -<h3><a class="toc-backref" href="#id50">Sending text through custom commands</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id50" id="sending-text-through-custom-commands" name="sending-text-through-custom-commands">Sending text through custom commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands using the <em>Edit->Format->Send Selection to</em> menu or keybindings. The output of the command will be @@ -1327,22 +1329,22 @@ deleted automatically.</p> <p>Normal shell quoting is supported, so you can do things like:</p> <ul class="simple"> -<li><tt class="docutils literal">sed <span class="pre">'s/\./(dot)/g'</span></tt></li> +<li><tt class="docutils literal"><span class="pre">sed</span> <span class="pre">'s/\./(dot)/g'</span></tt></li> </ul> -<p>The above example would normally be done with the <a class="reference internal" href="#replace-all">Replace all</a> +<p>The above example would normally be done with the <a class="reference" href="#replace-all">Replace all</a> function, but it can be handy to have common commands already set up.</p> </div> -<div class="section" id="context-actions"> -<h3><a class="toc-backref" href="#id51">Context actions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id51" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute the context action command on the current word at the cursor position or the available selection. This word or selection can be used as an argument to the command. The context action is invoked by a menu entry in the popup menu of the editor and also a keyboard shortcut (see the section called -<a class="reference internal" href="#keybindings">Keybindings</a>).</p> +<a class="reference" href="#keybindings">Keybindings</a>).</p> <p>The command can be specified in the preferences dialog and also for each filetype (see "context_action_cmd" in the section called -<a class="reference internal" href="#filetype-configuration">Filetype configuration</a>). When the context action is invoked, the filetype +<a class="reference" href="#filetype-configuration">Filetype configuration</a>). When the context action is invoked, the filetype specific command is used if available, otherwise the command specified in the preferences dialog is executed.</p> <p>The current word or selection can be referred with the wildcard "%s" @@ -1357,19 +1359,19 @@ <p>when executing the command, the %s is substituted by the word near the cursor position or by the current selection. If the cursor is at the word "echo", a browser window will open(assumed your browser is -called firefox) and it will open the address: <a class="reference external" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> +called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> -<div class="section" id="autocompletion"> -<h3><a class="toc-backref" href="#id52">Autocompletion</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id52" id="autocompletion" name="autocompletion">Autocompletion</a></h3> <p>Geany can offer a list of possible completions for symbols defined in the tags and for all words in a document.</p> <p>The autocompletion list for symbols is presented when the first few -characters of the symbol are typed (configurable, see <a class="reference internal" href="#editor-completions-preferences">Editor Completions +characters of the symbol are typed (configurable, see <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>, default 4) or when the <em>Complete word</em> -keybinding is pressed (configurable, see <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>, +keybinding is pressed (configurable, see <a class="reference" href="#editor-keybindings">Editor keybindings</a>, default Ctrl-Space).</p> <p>When the defined keybinding is typed and the <em>Autocomplete all words in -document</em> preference (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>) +document</em> preference (in <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>) is selected then the autocompletion list will show all matching words in the document, if there are no matching symbols.</p> <p>If you don't want to use autocompletion it can be dismissed until @@ -1381,13 +1383,13 @@ item on the autocompletion list can be chosen from the list by pressing Enter/Return. You can also double-click to select an item. The sequence will be completed to match the chosen item, and if the <em>Drop rest of -word on completion</em> preference is set (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions +word on completion</em> preference is set (in <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>) then any characters after the cursor that match a symbol or word are deleted.</p> -<div class="section" id="word-part-completion"> -<h4><a class="toc-backref" href="#id53">Word part completion</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id53" id="word-part-completion" name="word-part-completion">Word part completion</a></h4> <p>By default, pressing Tab will complete the selected item by word part; -useful e.g. for adding the prefix <tt class="docutils literal">gtk_combo_box_entry_</tt> without typing it +useful e.g. for adding the prefix <tt class="docutils literal"><span class="pre">gtk_combo_box_entry_</span></tt> without typing it manually:</p> <ul class="simple"> <li>gtk_com<TAB></li> @@ -1396,12 +1398,12 @@ <li>gtk_combo_box_entry_<s><ENTER></li> <li>gtk_combo_box_entry_set_text_column</li> </ul> -<p>The key combination can be changed from Tab - See <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>. +<p>The key combination can be changed from Tab - See <a class="reference" href="#editor-keybindings">Editor keybindings</a>. If you clear/change the key combination for word part completion, Tab will complete the whole word instead, like Enter.</p> </div> -<div class="section" id="scope-autocompletion"> -<h4><a class="toc-backref" href="#id54">Scope autocompletion</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id54" id="scope-autocompletion" name="scope-autocompletion">Scope autocompletion</a></h4> <p>E.g.:</p> <pre class="literal-block"> struct @@ -1410,7 +1412,7 @@ char c; } foo; </pre> -<p>When you type <tt class="docutils literal">foo.</tt> it will show an autocompletion list with 'i' and +<p>When you type <tt class="docutils literal"><span class="pre">foo.</span></tt> it will show an autocompletion list with 'i' and 'c' symbols.</p> <p>It only works for languages that set parent scope names for e.g. struct members. Currently this means C-like languages. The C tag parser only @@ -1418,39 +1420,39 @@ in local scope.</p> </div> </div> -<div class="section" id="user-definable-snippets"> -<h3><a class="toc-backref" href="#id55">User-definable snippets</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id55" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time when typing common strings and letting Geany do the work for you. To know what to complete or replace Geany reads a configuration file -called <tt class="docutils literal">snippets.conf</tt> at startup.</p> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5805] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5805 http://geany.svn.sourceforge.net/geany/?rev=5805&view=rev Author: statc Date: 2011-05-21 08:52:12 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5621..5640) Conflicts: src/Makefile.am src/main.c wscript Modified Paths: -------------- branches/sm/ChangeLog branches/sm/configure.ac branches/sm/data/filetypes.vala branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/geany.glade branches/sm/plugins/classbuilder.c branches/sm/plugins/filebrowser.c branches/sm/plugins/saveactions.c branches/sm/plugins/splitwindow.c branches/sm/po/ChangeLog branches/sm/po/de.po branches/sm/src/Makefile.am branches/sm/src/callbacks.c branches/sm/src/callbacks.h branches/sm/src/dialogs.c branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/editor.c branches/sm/src/editor.h branches/sm/src/encodings.c branches/sm/src/filetypes.c branches/sm/src/geanyentryaction.c branches/sm/src/highlighting.c branches/sm/src/interface.c branches/sm/src/interface.h branches/sm/src/keybindings.c branches/sm/src/keyfile.c branches/sm/src/log.c branches/sm/src/main.c branches/sm/src/makefile.win32 branches/sm/src/plugins.c branches/sm/src/printing.c branches/sm/src/project.c branches/sm/src/search.c branches/sm/src/sidebar.c branches/sm/src/socket.c branches/sm/src/toolbar.c branches/sm/src/tools.c branches/sm/src/ui_utils.c branches/sm/src/ui_utils.h branches/sm/src/utils.c branches/sm/src/utils.h branches/sm/src/vte.c branches/sm/wscript Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/ChangeLog 2011-05-21 08:52:12 UTC (rev 5805) @@ -1,3 +1,41 @@ +2011-03-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/makefile.win32, src/main.c, src/Makefile.am, configure.ac, + wscript: + Initialize GLib's Gthread system early at startup in case any + plugins need it. + + +2011-03-26 Colomban Wendling <colomban(at)geany(dot)org> + + * src/sidebar.c: + Fix the sidebar popup menu to properly use the currently selected item + rather than the previous one. + Also change the hack used for the selection to be updated in the input + handlers to call the GtkTreeView's handler manually rather than doing + the actual job in IDLE callbacks for the TreeView's handler to have run. + * doc/geany.html, doc/geany.txt, geany.glade, src/document.c, + src/editor.h, src/interface.c, src/interface.h, src/keyfile.c, + src/project.c: + Add possibility to detect the indentation width from the file content + (not supported if indentation type is tabs only). + * plugins/splitwindow.c: + Enable code folding in splitview window (based on a patch by Matthew + Brush, thanks! - closes #3097780). + Fix confusing terminology in Split Window plugin menu labels (patch + by Matthew Brush - closes #2796316). + Don't unsplit when closing the displayed document but rather pick the + new current one if any. + + +2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> + + * data/filetypes.vala: + Update Vala keywords (based on a patch from Matthew Brush, thanks). + * data/document.c: + Small code cleanups. + + 2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/filebrowser.c: @@ -2,2 +40,8 @@ Add history to filter entry. + * src/keybindings.c, src/vte.c: + Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste + (Ctrl-Shift-V). + * src/keybindings.c: + Make VTE copy/paste shortcuts work if 'Override Geany + keybindings' is not set. @@ -8,6 +52,17 @@ * doc/geany.txt, doc/geany.html: Update the documentation to talk about real-time tag parsing. + * doc/geany.txt, doc/geany.html, src/callbacks.c, src/callbacks.h, + src/document.c, src/document.h, src/geanyentryaction.c, + src/search.c, src/toolbar.c, src/ui_utils.c, src/ui_utils.h: + Make Shift-Enter in search dialog and toolbar search entries search + backwards. + * plugins/filebrowser.c, plugins/saveactions.c, src/callbacks.c, + src/dialogs.c, src/document.c, src/document.h, src/editor.c, + src/encodings.c, src/filetypes.c, src/highlighting.c, src/log.c, + src/main.c, src/plugins.c, src/printing.c, src/project.c, src/search.c, + src/socket.c, src/toolbar.c, src/utils.c, src/utils.h: + Improve usage of G_LIKELY() and G_UNLIKELY() macros. 2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/sm/configure.ac =================================================================== --- branches/sm/configure.ac 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/configure.ac 2011-05-21 08:52:12 UTC (rev 5805) @@ -146,6 +146,11 @@ if test $have_gio = 1 ; then AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) fi +# GTHREAD checks +gthread_modules="gthread-2.0" +PKG_CHECK_MODULES(GTHREAD, [$gthread_modules]) +AC_SUBST(GTHREAD_CFLAGS) +AC_SUBST(GTHREAD_LIBS) # --disable-deprecated switch for GTK2 purification AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], Modified: branches/sm/data/filetypes.vala =================================================================== --- branches/sm/data/filetypes.vala 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/data/filetypes.vala 2011-05-21 08:52:12 UTC (rev 5805) @@ -26,10 +26,10 @@ [keywords] # all items must be in one line -primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t +primary=abstract as async base bool break callback case catch char class const constpointer construct continue default delegate delete do double dynamic else ensures enum errordomain extern false finally float for foreach generic get global if in inline int int16 int32 int64 int8 interface internal is lock long namespace new null out override owned private protected public ref requires return set sealed short signal size_t sizeof ssize_t static string struct switch this throw throws time_t true try typeof uchar uint uint16 uint32 uint64 uint8 ulong unichar unowned ushort using value var virtual void weak while yield #secondary= -# these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +# these are some doxygen and valadoc keywords (incomplete) +docComment=attention author brief bug class code date def deprecated enum example exception file fn inheritDoc link namespace note param remarks return see since struct throw throws todo typedef union var version warning [lexer_properties] styling.within.preprocessor=1 Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/doc/geany.html 2011-05-21 08:52:12 UTC (rev 5805) @@ -1578,7 +1578,8 @@ <h4><a class="toc-backref" href="#id60">Search bar</a></h4> <p>The quickest way to find some text is to use the search bar entry in the toolbar. This performs a case-insensitive search in the current -document whilst you type. Pressing Enter will search again.</p> +document whilst you type. Pressing Enter will search again, and pressing +Shift-Enter will search backwards.</p> </div> </div> <div class="section" id="find"> @@ -2337,6 +2338,12 @@ <h4><a class="toc-backref" href="#id105">Indentation group</a></h4> <p>See <a class="reference internal" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> +<dt>Width</dt> +<dd>The width of a single indent size in spaces. By default the indent +size is equivalent to 4 spaces.</dd> +<dt>Detect width from file</dt> +<dd>Try to detect and set the indent width based on file content, when +a file is opened.</dd> <dt>Type</dt> <dd><p class="first">When Geany inserts indentation, whether to use:</p> <ul class="simple"> @@ -2347,10 +2354,7 @@ <p class="last">The <em>Tabs and Spaces</em> indent type is also known as <em>Soft tab support</em> in some other editors.</p> </dd> -<dt>Width</dt> -<dd>The width of a single indent size in spaces. By default the indent -size is equivalent to 4 spaces.</dd> -<dt>Detect from file</dt> +<dt>Detect type from file</dt> <dd>Try to detect and set the indent type based on file content, when a file is opened.</dd> <dt>Auto-indent mode</dt> @@ -6483,7 +6487,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-03-24 02:06 UTC. +Generated on: 2011-03-26 17:15 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: branches/sm/doc/geany.txt =================================================================== --- branches/sm/doc/geany.txt 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/doc/geany.txt 2011-05-21 08:52:12 UTC (rev 5805) @@ -1167,7 +1167,8 @@ `````````` The quickest way to find some text is to use the search bar entry in the toolbar. This performs a case-insensitive search in the current -document whilst you type. Pressing Enter will search again. +document whilst you type. Pressing Enter will search again, and pressing +Shift-Enter will search backwards. Find ^^^^ @@ -1992,6 +1993,14 @@ See `Indentation`_ for more information. +Width + The width of a single indent size in spaces. By default the indent + size is equivalent to 4 spaces. + +Detect width from file + Try to detect and set the indent width based on file content, when + a file is opened. + Type When Geany inserts indentation, whether to use: @@ -2002,11 +2011,7 @@ The *Tabs and Spaces* indent type is also known as *Soft tab support* in some other editors. -Width - The width of a single indent size in spaces. By default the indent - size is equivalent to 4 spaces. - -Detect from file +Detect type from file Try to detect and set the indent type based on file content, when a file is opened. Modified: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/geany.glade 2011-05-21 08:52:12 UTC (rev 5805) @@ -6171,16 +6171,16 @@ <child> <widget class="GtkTable" id="table13"> <property name="visible">True</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> <property name="column_spacing">24</property> <child> - <widget class="GtkLabel" id="label183"> + <widget class="GtkLabel" id="label222"> <property name="visible">True</property> - <property name="label" translatable="yes">Auto-indent mode:</property> + <property name="label" translatable="yes">Width:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6198,37 +6198,39 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_auto_indent_mode"> + <widget class="GtkSpinButton" id="spin_indent_width"> <property name="visible">True</property> - <property name="items" translatable="yes">None -Basic -Current chars -Match braces</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="tooltip" translatable="yes">The width in chars of a single indent</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_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <widget class="GtkLabel" id="label183"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Auto-indent mode:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6246,69 +6248,62 @@ <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="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label222"> + <widget class="GtkComboBox" id="combo_auto_indent_mode"> <property name="visible">True</property> - <property name="label" translatable="yes">Width:</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> + <property name="items" translatable="yes">None +Basic +Current chars +Match braces</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_indent_width"> + <widget class="GtkCheckButton" id="check_detect_indent_type"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</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_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 0</property> + <property name="label" translatable="yes">Detect type from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_spaces"> + <widget class="GtkRadioButton" id="radio_indent_both"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> + <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6319,67 +6314,67 @@ <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="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_tabs"> + <widget class="GtkRadioButton" id="radio_indent_spaces"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use one tab per indent</property> + <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Tabs</property> + <property name="label" translatable="yes">_Spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</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="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_both"> + <widget class="GtkRadioButton" id="radio_indent_tabs"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> + <property name="tooltip" translatable="yes">Use one tab per indent</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and spaces</property> + <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</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="GtkCheckButton" id="check_detect_indent"> + <widget class="GtkCheckButton" id="check_detect_indent_width"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Detect from file</property> + <property name="label" translatable="yes">Detect width from file</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6390,12 +6385,40 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</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="GtkLabel" id="label200"> + <property name="visible">True</property> + <property name="label" translatable="yes">Type:</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">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -10161,16 +10184,16 @@ <widget class="GtkTable" id="table17"> <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> <property name="column_spacing">24</property> <child> - <widget class="GtkLabel" id="label228"> + <widget class="GtkLabel" id="label230"> <property name="visible">True</property> - <property name="label" translatable="yes">Auto-indent mode:</property> + <property name="label" translatable="yes">Width:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10188,37 +10211,39 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_auto_indent_mode"> + <widget class="GtkSpinButton" id="spin_indent_width"> <property name="visible">True</property> - <property name="items" translatable="yes">None -Basic -Current chars -Match braces</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="tooltip" translatable="yes">The width in chars of a single indent</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_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label229"> + <widget class="GtkLabel" id="label228"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Auto-indent mode:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10236,69 +10261,62 @@ <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="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label230"> + <widget class="GtkComboBox" id="combo_auto_indent_mode"> <property name="visible">True</property> - <property name="label" translatable="yes">Width:</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> + <property name="items" translatable="yes">None +Basic +Current chars +Match braces</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_indent_width"> + <widget class="GtkCheckButton" id="check_detect_indent_type"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</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_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 0</property> + <property name="label" translatable="yes">Detect type from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_spaces"> + <widget class="GtkRadioButton" id="radio_indent_both"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> + <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -10309,67 +10327,95 @@ <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="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_tabs"> + <widget class="GtkRadioButton" id="radio_indent_spaces"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use one tab per indent</property> + <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Tabs</property> + <property name="label" translatable="yes">_Spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</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="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_both"> + <widget class="GtkRadioButton" id="radio_indent_tabs"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> + <property name="tooltip" translatable="yes">Use one tab per indent</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and spaces</property> + <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</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="GtkCheckButton" id="check_detect_indent"> + <widget class="GtkLabel" id="label229"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="label" translatable="yes">Type:</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">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_detect_indent_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Detect from file</property> + <property name="label" translatable="yes">Detect width from file</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -10380,8 +10426,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</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> @@ -10670,4 +10716,17 @@ </child> </widget> +<widget class="GtkCheckButton" id="checkbutton3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Detect from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +</widget> + </glade-interface> Modified: branches/sm/plugins/classbuilder.c =================================================================== --- branches/sm/plugins/classbuilder.c 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/plugins/classbuilder.c 2011-05-21 08:52:12 UTC (rev 5805) @@ -201,7 +201,7 @@ {fileheader}\n\ {namespace_decl}\n\ {base_include}\n\ -{abstract_decl}class {class_name}{base_decl}{implements_decl}\n\{\n\ +{abstract_decl}class {class_name}{base_decl}{implements_decl}\n{\n\ {singleton_impl}\ {constructor_impl}\ {destructor_impl}\n\ @@ -356,7 +356,7 @@ } /* Creates a new option label, indented on the left */ -GtkWidget *cc_option_label_new(const gchar *text) +static GtkWidget *cc_option_label_new(const gchar *text) { GtkWidget *align; GtkWidget *label; @@ -373,10 +373,8 @@ /* Attaches a new section label at the specified table row, optionally * padded at the top, and returns the new label. */ -GtkWidget *cc_table_attach_section_label(GtkWidget *table, - const gchar *text, - gint row, - gboolean top_padding) +static GtkWidget *cc_table_attach_section_label(GtkWidget *table, const gchar *text, + gint row, gboolean top_padding) { gchar *markup; GtkWidget *label, *align; @@ -401,9 +399,7 @@ /* Attach a new option label at the specified table row and returns * the label */ -GtkWidget *cc_table_attach_option_label(GtkWidget *table, - const gchar *text, - gint row) +static GtkWidget *cc_table_attach_option_label(GtkWidget *table, const gchar *text, gint row) { GtkWidget *opt_label = cc_option_label_new(text); gtk_table_attach(GTK_TABLE(table), opt_label, @@ -416,9 +412,7 @@ * The label associated with the widget is set as data on the entry * with the "label" key, if access to it is needed later. The entry * widget is returned. */ -GtkWidget *cc_table_attach_option_entry(GtkWidget *table, - const gchar *text, - gint row) +static GtkWidget *cc_table_attach_option_entry(GtkWidget *table, const gchar *text, gint row) { GtkWidget *label; GtkWidget *entry; @@ -431,7 +425,7 @@ return entry; } -void show_dialog_create_class(gint type) +static void show_dialog_create_class(gint type) { CreateClassDialog *cc_dlg; GtkWidget *main_box, *table, *label, *hdr_hbox; Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:52:12 UTC (rev 5805) @@ -123,7 +123,7 @@ { gsize len; - if (! NZV(base_name)) + if (G_UNLIKELY(! NZV(base_name))) return FALSE; #ifdef G_OS_WIN32 Modified: branches/sm/plugins/saveactions.c =================================================================== --- branches/sm/plugins/saveactions.c 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/plugins/saveactions.c 2011-05-21 08:52:12 UTC (rev 5805) @@ -91,7 +91,7 @@ { gchar *tmp; - if (! NZV(utf8_dir)) + if (G_UNLIKELY(! NZV(utf8_dir))) return FALSE; tmp = utils_get_locale_from_utf8(utf8_dir); Modified: branches/sm/plugins/splitwindow.c =================================================================== --- branches/sm/plugins/splitwindow.c 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/plugins/splitwindow.c 2011-05-21 08:52:12 UTC (rev 5805) @@ -73,10 +73,11 @@ ScintillaObject *sci; /* new editor widget */ GtkWidget *vbox; GtkWidget *name_label; + gint handler_id; } EditWindow; -static EditWindow edit_window = {NULL, NULL, NULL, NULL}; +static EditWindow edit_window = {NULL, NULL, NULL, NULL, 0 }; static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); @@ -103,6 +104,25 @@ } +static void on_sci_notify (ScintillaObject *sci, gint param, SCNotification *notif, gpointer data) +{ + gint line; + + switch (notif->nmhdr.code) + { + case SCN_MARGINCLICK: + if (notif->margin == 2) + { + line = sci_get_line_from_position(sci, notif->position); + scintilla_send_message(sci, SCI_TOGGLEFOLD, line, 0); + } + break; + + default: break; + } +} + + static void sync_to_current(ScintillaObject *sci, ScintillaObject *current) { gpointer sdoc; @@ -119,7 +139,6 @@ /* override some defaults */ set_line_numbers(sci, geany->editor_prefs->show_linenumber_margin); scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin (no commands) */ - scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 2, 0 ); /* hide fold margin (no toggle callback) */ } @@ -127,6 +146,12 @@ { editwin->editor = editor; + if (editwin->handler_id > 0 && editwin->sci != NULL) + { + g_signal_handler_disconnect(editwin->sci, editwin->handler_id); + editwin->handler_id = 0; + } + /* first destroy any widget, otherwise its signals will have an * invalid document as user_data */ if (editwin->sci != NULL) @@ -138,6 +163,12 @@ sync_to_current(editwin->sci, editor->sci); + if (geany->editor_prefs->folding) + editwin->handler_id = g_signal_connect(editwin->sci, "sci-notify", + G_CALLBACK(on_sci_notify), NULL); + else + scintilla_send_message(editwin->sci, SCI_SETMARGINWIDTHN, 2, 0); + gtk_label_set_text(GTK_LABEL(editwin->name_label), DOC_FILENAME(editor->document)); } @@ -174,14 +205,14 @@ static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label, const gchar *tooltip) { GtkToolItem *item; - gchar *dup = NULL; + gchar *dupl = NULL; if (stock_id && !label) { label = ui_get_stock_label(stock_id); } - dup = utils_str_remove_chars(g_strdup(label), "_"); - label = dup; + dupl = utils_str_remove_chars(g_strdup(label), "_"); + label = dupl; item = gtk_tool_button_new(NULL, label); if (stock_id) @@ -192,7 +223,7 @@ if (tooltip) ui_widget_set_tooltip_text(GTK_WIDGET(item), tooltip); - g_free(dup); + g_free(dupl); return GTK_WIDGET(item); } @@ -332,6 +363,12 @@ gtk_widget_reparent(notebook, ui_lookup_widget(geany->main_widgets->window, "vbox1")); + if (edit_window.sci != NULL && edit_window.handler_id > 0) + { + g_signal_handler_disconnect(edit_window.sci, edit_window.handler_id); + edit_window.handler_id = 0; + } + gtk_widget_destroy(pane); edit_window.editor = NULL; edit_window.sci = NULL; @@ -372,12 +409,12 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items.main), menu); menu_items.horizontal = item = - gtk_menu_item_new_with_mnemonic(_("_Horizontally")); + gtk_menu_item_new_with_mnemonic(_("_Side by Side")); g_signal_connect(item, "activate", G_CALLBACK(on_split_horizontally), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); menu_items.vertical = item = - gtk_menu_item_new_with_mnemonic(_("_Vertically")); + gtk_menu_item_new_with_mnemonic(_("_Top and Bottom")); g_signal_connect(item, "activate", G_CALLBACK(on_split_vertically), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); @@ -401,11 +438,31 @@ } +static gboolean do_select_current(gpointer data) +{ + GeanyDocument *doc; + + /* guard out for the unlikely case we get called after another unsplitting */ + if (plugin_state == STATE_UNSPLIT) + return FALSE; + + doc = document_get_current(); + if (DOC_VALID(doc)) + set_editor(&edit_window, doc->editor); + else + on_unsplit(NULL, NULL); + + return FALSE; +} + + static void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) { - /* remove the split window because the document won't exist anymore */ if (doc->editor == edit_window.editor) - on_unsplit(NULL, NULL); + { + /* select current or unsplit in IDLE time, so the tab has changed */ + g_idle_add(do_select_current, NULL); + } } Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/po/ChangeLog 2011-05-21 08:52:12 UTC (rev 5805) @@ -1,3 +1,8 @@ +2011-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation. + + 2011-03-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sl.po: Fix of a typo inside Slovenian translation. Thanks to Jože Klepec. Modified: branches/sm/po/de.po =================================================================== --- branches/sm/po/de.po 2011-05-21 08:50:00 UTC (rev 5804) +++ branches/sm/po/de.po 2011-05-21 08:52:12 UTC (rev 5805) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 20:08+0100\n" -"PO-Revision-Date: 2011-03-06 20:14+0100\n" +"POT-Creation-Date: 2011-03-27 13:18+0200\n" +"PO-Revision-Date: 2011-03-27 13:18+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -28,9 +28,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 -#: ../src/interface.c:310 -#: ../src/interface.c:1814 +#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -64,8 +62,7 @@ msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 -#: ../src/about.c:297 +#: ../src/about.c:289 ../src/about.c:297 msgid "developer" msgstr "Entwickler" @@ -87,8 +84,11 @@ #: ../src/about.c:365 #, c-format -msgid "Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " +"detailliertere Liste findet sich in der Datei %s):" #: ../src/about.c:391 msgid "Credits" @@ -99,8 +99,12 @@ msgstr "Lizenz" #: ../src/about.c:414 -msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." -msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." +msgid "" +"License text could not be found, please visit http://www.gnu.org/licenses/" +"gpl-2.0.txt to view it online." +msgstr "" +"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." +"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #. fall back to %d #: ../src/build.c:655 @@ -117,9 +121,7 @@ msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:739 -#: ../src/build.c:961 -#: ../src/search.c:1524 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1542 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -135,13 +137,20 @@ msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" #: ../src/build.c:890 -msgid "Could not execute the file in the VTE because it probably contains a command." -msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile." +msgid "" +"Could not execute the file in the VTE because it probably contains a command." +msgstr "" +"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " +"Befehl auf der Kommandozeile." #: ../src/build.c:928 #, c-format -msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" -msgstr "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " +"den Einstellungen überprüfen)" #: ../src/build.c:1101 msgid "Compilation failed." @@ -157,7 +166,9 @@ #: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird." +msgstr "" +"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " +"wird." #: ../src/build.c:1353 msgid "_Next Error" @@ -171,8 +182,7 @@ msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1649 -#: ../src/toolbar.c:374 +#: ../src/build.c:1649 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" @@ -193,8 +203,7 @@ msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1711 -#: ../src/build.c:1723 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -203,13 +212,11 @@ msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1845 -#: ../src/symbols.c:737 +#: ../src/build.c:1845 ../src/symbols.c:737 msgid "Label" msgstr "Label" -#: ../src/build.c:1846 -#: ../src/symbols.c:732 +#: ../src/build.c:1846 ../src/symbols.c:732 msgid "Command" msgstr "Kommando" @@ -225,8 +232,7 @@ msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:1975 -#: ../src/build.c:1977 +#: ../src/build.c:1975 ../src/build.c:1977 #, c-format msgid "%s Commands" msgstr "Kommandos für %s" @@ -235,8 +241,7 @@ msgid "No Filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1985 -#: ../src/build.c:2020 +#: ../src/build.c:1985 ../src/build.c:2020 msgid "Error Regular Expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" @@ -246,7 +251,9 @@ #: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." -msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an" +msgstr "" +"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " +"Kommandos an" #: ../src/build.c:2054 msgid "Execute Commands" @@ -254,8 +261,12 @@ #: ../src/build.c:2066 #, c-format -msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." -msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" +"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " +"- Details gibt es in der Dokumentation." #: ../src/build.c:2226 msgid "Set Build Commands" @@ -266,34 +277,25 @@ msgstr "_Kompilieren" #. build the code -#: ../src/build.c:2444 -#: ../src/build.c:2706 -#: ../src/interface.c:1223 +#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:2451 -#: ../src/build.c:2481 -#: ../src/build.c:2674 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2496 -#: ../src/build.c:2672 -#: ../src/build.c:2726 +#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2498 -#: ../src/build.c:2673 -#: ../src/build.c:2734 +#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2500 -#: ../src/build.c:2671 +#: ../src/build.c:2500 ../src/build.c:2671 msgid "_Make" msgstr "_Make" @@ -318,10 +320,8 @@ msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:490 -#: ../src/document.c:2999 -#: ../src/interface.c:381 -#: ../src/sidebar.c:695 +#: ../src/callbacks.c:490 ../src/document.c:2900 ../src/interface.c:381 +#: ../src/sidebar.c:687 msgid "_Reload" msgstr "_Neu laden" @@ -334,75 +334,69 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1196 -#: ../src/keybindings.c:425 +#: ../src/callbacks.c:1210 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1197 +#: ../src/callbacks.c:1211 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1291 -#: ../src/callbacks.c:1316 -msgid "Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1305 ../src/callbacks.c:1332 +msgid "" +"Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1424 -#: ../src/ui_utils.c:619 +#: ../src/callbacks.c:1448 ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1426 -#: ../src/ui_utils.c:620 +#: ../src/callbacks.c:1450 ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1428 -#: ../src/ui_utils.c:621 +#: ../src/callbacks.c:1452 ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1430 -#: ../src/ui_utils.c:630 +#: ../src/callbacks.c:1454 ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1432 -#: ../src/ui_utils.c:631 +#: ../src/callbacks.c:1456 ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1434 -#: ../src/ui_utils.c:632 +#: ../src/callbacks.c:1458 ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1436 -#: ../src/ui_utils.c:641 +#: ../src/callbacks.c:1460 ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1440 +#: ../src/callbacks.c:1464 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1441 -msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." -msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei funktionieren alle Platzhalter der ANSI C Funktion »strftime«." +#: ../src/callbacks.c:1465 +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " +"funktionieren alle Platzhalter der ANSI C Funktion »strftime«." -#: ../src/callbacks.c:1462 +#: ../src/callbacks.c:1488 msgid "Date format string could not be converted (possibly too long)." -msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "" +"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1688 -#: ../src/callbacks.c:1698 +#: ../src/callbacks.c:1716 ../src/callbacks.c:1726 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#: ../src/dialogs.c:178 -#: ../src/interface.c:3912 -#: ../src/interface.c:5553 +#: ../src/dialogs.c:178 ../src/interface.c:5716 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -426,31 +420,27 @@ msgid "Middle Eastern" msgstr "Nahöstlich" -#: ../src/dialogs.c:191 -#: ../src/encodings.c:120 -#: ../src/encodings.c:121 -#: ../src/encodings.c:122 -#: ../src/encodings.c:123 -#: ../src/encodings.c:124 -#: ../src/encodings.c:125 -#: ../src/encodings.c:126 -#: ../src/encodings.c:127 +#: ../src/dialogs.c:191 ../src/encodings.c:120 ../src/encodings.c:121 +#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124 +#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127 msgid "Unicode" msgstr "Unicode" -#: ../src/dialogs.c:239 -#: ../src/dialogs.c:324 +#: ../src/dialogs.c:239 ../src/dialogs.c:324 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:243 -#: ../src/interface.c:873 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:246 -msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." -msgstr "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle schreibgeschützt geöffnet." +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle " +"schreibgeschützt geöffnet." #: ../src/dialogs.c:268 msgid "Detect by file extension" @@ -471,11 +461,16 @@ #: ../src/dialogs.c:384 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen encoding." +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " +"automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " +"gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo #: ../src/dialogs.c:391 @@ -484,11 +479,15 @@ #: ../src/dialogs.c:401 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen filetype." +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " +"Dateiendung erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem " +"gewählten Dateityp geöffnet." #: ../src/dialogs.c:480 msgid "Overwrite?" @@ -498,8 +497,7 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:513 -#: ../src/dialogs.c:642 +#: ../src/dialogs.c:513 ../src/dialogs.c:642 msgid "Save File" msgstr "Datei speichern" @@ -516,28 +514,27 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:533 -msgid "Keep the current unsaved document open and open the newly saved file in a new tab" -msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " +"neuen Reiter." -#: ../src/dialogs.c:660 -#: ../src/win32.c:681 +#: ../src/dialogs.c:660 ../src/win32.c:681 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:663 -#: ../src/dialogs.c:1543 -#: ../src/win32.c:687 +#: ../src/dialogs.c:663 ../src/dialogs.c:1543 ../src/win32.c:687 #: ../src/win32.c:746 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:666 -#: ../src/win32.c:693 +#: ../src/dialogs.c:666 ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:669 -#: ../src/win32.c:699 +#: ../src/dialogs.c:669 ../src/win32.c:699 msgid "Information" msgstr "Information" @@ -559,24 +556,21 @@ msgstr "Schriftart auswählen" #: ../src/dialogs.c:1157 -msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " +"werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1176 -#: ../src/dialogs.c:1177 -#: ../src/dialogs.c:1178 -#: ../src/dialogs.c:1184 -#: ../src/dialogs.c:1185 -#: ../src/dialogs.c:1186 -#: ../src/symbols.c:1980 -#: ../src/symbols.c:2001 -#: ../src/symbols.c:2053 +#: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 +#: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 +#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1191 -#: ../src/symbols.c:887 +#: ../src/dialogs.c:1191 ../src/symbols.c:887 msgid "Properties" msgstr "Eigenschaften" @@ -604,8 +598,7 @@ msgid "<b>Encoding:</b>" msgstr "<b>Kodierung:</b>" -#: ../src/dialogs.c:1290 -#: ../src/ui_utils.c:248 +#: ../src/dialogs.c:1290 ../src/ui_utils.c:248 msgid "(with BOM)" msgstr "(mit BOM)" @@ -667,58 +660,67 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:967 -#: ../src/document.c:1485 +#: ../src/document.c:845 ../src/document.c:1370 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." -#: ../src/document.c:997 +#: ../src/document.c:865 #, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "Die Datei »%s« ist kein gültiges %s." + +#: ../src/document.c:871 +#, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " +"wird nicht unterstützt." + +#: ../src/document.c:881 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " +"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " +"enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#. For translators: the second wildcard is an encoding name, e.g. -#. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1023 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "Die Datei »%s« ist kein gültiges %s." - -#: ../src/document.c:1033 -#, c-format -msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." -msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." - -#: ../src/document.c:1184 +#: ../src/document.c:1090 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1187 +#: ../src/document.c:1093 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1190 +#: ../src/document.c:1096 msgid "Tabs and Spaces" msgstr "Tabulatoren und Leerzeichen" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1195 +#: ../src/document.c:1101 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1248 -#: ../src/document.c:1858 +#: ../src/document.c:1111 +#, c-format +msgid "Setting indentation width to %d for %s." +msgstr "Setze Einrückungsbreite auf %d für »%s«." + +#: ../src/document.c:1145 ../src/document.c:1743 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1363 +#: ../src/document.c:1260 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -726,25 +728,29 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1368 +#: ../src/document.c:1265 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1370 +#: ../src/document.c:1267 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1579 +#: ../src/document.c:1464 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1666 +#: ../src/document.c:1551 #, c-format -msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." -msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird <i>nicht</i> gespeichert." +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " +"Die Datei wird <i>nicht</i> gespeichert." -#: ../src/document.c:1688 +#: ../src/document.c:1573 #, c-format msgid "" "Error message: %s\n" @@ -753,33 +759,35 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1693 +#: ../src/document.c:1578 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1743 +#: ../src/document.c:1628 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" -#: ../src/document.c:1761 +#: ../src/document.c:1646 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" -#: ../src/document.c:1775 +#: ../src/document.c:1660 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1858 -#: ../src/document.c:1923 +#: ../src/document.c:1743 ../src/document.c:1808 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1928 +#: ../src/document.c:1813 #, c-format msgid "" "%s\n" @@ -790,76 +798,74 @@ "\n" "Die Datei ist möglicherweise nicht vollständig auf der Festplatte gespeichert" -#: ../src/document.c:1930 +#: ../src/document.c:1815 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1954 +#: ../src/document.c:1839 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:2022 -#: ../src/document.c:2079 -#: ../src/document.c:2087 +#: ../src/document.c:1916 ../src/document.c:1973 ../src/document.c:1981 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:2087 +#: ../src/document.c:1981 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2166 -#: ../src/search.c:1185 -#: ../src/search.c:1229 -#: ../src/search.c:1920 -#: ../src/search.c:1921 +#: ../src/document.c:2060 ../src/search.c:1203 ../src/search.c:1247 +#: ../src/search.c:1938 ../src/search.c:1939 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2177 -#: ../src/document.c:2186 +#: ../src/document.c:2071 ../src/document.c:2080 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:3000 +#: ../src/document.c:2901 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:3001 +#: ../src/document.c:2902 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." +msgstr "" +"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " +"Version." -#: ../src/document.c:3019 +#: ../src/document.c:2920 msgid "Close _without saving" msgstr "Schließen _ohne Speichern" -#: ../src/document.c:3022 +#: ../src/document.c:2923 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:3023 +#: ../src/document.c:2924 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4362 +#: ../src/editor.c:4382 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4363 +#: ../src/editor.c:4383 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." +msgstr "" +"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " +"werden sollen." -#: ../src/editor.c:4513 +#: ../src/editor.c:4533 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -868,8 +874,7 @@ msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:76 -#: ../src/encodings.c:77 +#: ../src/encodings.c:76 ../src/encodings.c:77 msgid "Greek" msgstr "Griechisch" @@ -881,31 +886,22 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:80 -#: ../src/encodings.c:81 -#: ../src/encodings.c:82 +#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 #: ../src/encodings.c:83 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:85 -#: ../src/encodings.c:86 -#: ../src/encodings.c:87 +#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:88 -#: ../src/encodings.c:89 -#: ../src/encodings.c:90 +#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:91 -#: ../src/encodings.c:92 -#: ../src/encodings.c:94 -#: ../src/encodings.c:95 -#: ../src/encodings.c:96 +#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94 +#: ../src/encodings.c:95 ../src/encodings.c:96 msgid "Cyrillic" msgstr "Kyrillisch" @@ -921,16 +917,12 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:101 -#: ../src/encodings.c:102 -#: ../src/encodings.c:103 +#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:104 -#: ../src/encodings.c:106 -#: ../src/encodings.c:107 +#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107 msgid "Hebrew" msgstr "Hebräisch" @@ -950,42 +942,30 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:113 -#: ../src/encodings.c:114 -#: ../src/encodings.c:115 +#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:116 -#: ../src/encodings.c:117 -#: ../src/encodings.c:118 +#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118 msgid "Vietnamese" msgstr "Vietnamesisch" #. maybe not available on Linux -#: ../src/encodings.c:129 -#: ../src/encodings.c:130 -#: ../src/encodings.c:131 +#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131 #: ../src/encodings.c:133 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:134 -#: ../src/encodings.c:135 -#: ../src/encodings.c:136 +#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:137 -#: ../src/encodings.c:138 -#: ../src/encodings.c:139 +#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139 #: ../src/encodings.c:140 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:141 -#: ../src/encodings.c:142 -#: ../src/encodings.c:143 +#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143 #: ../src/encodings.c:144 msgid "Korean" msgstr "Koreanisch" @@ -1018,11 +998,8 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:80 -#: ../src/filetypes.c:162 -#: ../src/filetypes.c:176 -#: ../src/filetypes.c:184 -#: ../src/filetypes.c:198 +#: ../src/filetypes.c:80 ../src/filetypes.c:162 ../src/filetypes.c:176 +#: ../src/filetypes.c:184 ../src/filetypes.c:198 #, c-format msgid "%s source file" msgstr "%s Quelldatei" @@ -1032,10 +1009,8 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:99 -#: ../src/filetypes.c:1560 -#: ../src/interface.c:3855 -#: ../src/interface.c:5496 +#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3874 +#: ../src/interface.c:5524 msgid "None" msgstr "Keiner" @@ -1072,41 +1047,37 @@ msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:668 +#: ../src/filetypes.c:667 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:669 +#: ../src/filetypes.c:668 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:670 +#: ../src/filetypes.c:669 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:671 +#: ../src/filetypes.c:670 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:672 +#: ../src/filetypes.c:671 msgid "_Custom Filetypes" msgstr "_Benutzerdefinierte Dateitypen" -#: ../src/filetypes.c:1288 -#: ../src/win32.c:105 +#: ../src/filetypes.c:1373 ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1313 -#: ../src/project.c:293 -#: ../src/win32.c:95 -#: ../src/win32.c:143 -#: ../src/win32.c:145 +#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1371 +#: ../src/filetypes.c:1456 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1115,10 +1086,8 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3621 -#: ../src/main.c:815 -#: ../src/socket.c:165 -#: ../src/templates.c:315 +#: ../src/highlighting.c:3621 ../src/main.c:817 ../src/socket.c:165 +#: ../src/templates.c:327 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." @@ -1139,8 +1108,7 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:352 -#: ../src/interface.c:2346 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1156,14 +1124,9 @@ msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:400 -#: ../src/interface.c:635 -#: ../src/interface.c:694 -#: ../src/interface.c:708 -#: ../src/interface.c:1088 -#: ../src/interface.c:1098 -#: ../src/interface.c:2311 -#: ../src/interface.c:2325 +#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 +#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 +#: ../src/interface.c:2311 ../src/interface.c:2325 msgid "invisible" msgstr "unsichtbar" @@ -1171,18 +1134,15 @@ msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:434 -#: ../src/notebook.c:257 +#: ../src/interface.c:434 ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:442 -#: ../src/notebook.c:262 +#: ../src/interface.c:442 ../src/notebook.c:262 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:459 -#: ../src/interface.c:2241 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Bearbeiten" @@ -1190,58 +1150,47 @@ msgid "_Commands" msgstr "_Kommandos" -#: ../src/interface.c:516 -#: ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../src/interface.c:524 -#: ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../src/interface.c:532 -#: ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../src/interface.c:536 -#: ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:545 -#: ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../src/interface.c:549 -#: ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../src/interface.c:558 -#: ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:562 -#: ../src/interface.c:2245 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:569 -#: ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../src/interface.c:573 -#: ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:577 -#: ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" @@ -1265,8 +1214,7 @@ msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:619 -#: ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1278,49 +1226,39 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:654 -#: ../src/interface.c:2260 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:658 -#: ../src/interface.c:2264 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:662 -#: ../src/interface.c:2268 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:671 -#: ../src/interface.c:2283 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:675 -#: ../src/interface.c:2287 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:679 -#: ../src/interface.c:2291 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:683 -#: ../src/interface.c:2300 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:697 -#: ../src/interface.c:2314 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:711 -#: ../src/interface.c:2333 -#: ../src/keybindings.c:374 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -1328,13 +1266,11 @@ msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:728 -#: ../src/keybindings.c:387 +#: ../src/interface.c:728 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../src/interface.c:736 -#: ../src/interface.c:2337 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "_Suchen" @@ -1350,8 +1286,7 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:768 -#: ../src/search.c:614 +#: ../src/interface.c:768 ../src/search.c:620 msgid "_Replace" msgstr "_Ersetzen" @@ -1363,13 +1298,11 @@ msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:802 -#: ../src/keybindings.c:434 +#: ../src/interface.c:802 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../src/interface.c:806 -#: ../src/keybindings.c:437 +#: ../src/interface.c:806 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1377,39 +1310,31 @@ msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:823 -#: ../src/interface.c:2272 -#: ../src/interface.c:3531 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3532 msgid "_More" msgstr "_Weitere" -#: ../src/interface.c:830 -#: ../src/keybindings.c:399 +#: ../src/interface.c:830 ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../src/interface.c:834 -#: ../src/keybindings.c:401 +#: ../src/interface.c:834 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../src/interface.c:843 -#: ../src/interface.c:2354 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:847 -#: ../src/interface.c:2362 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:856 -#: ../src/keybindings.c:416 +#: ../src/interface.c:856 ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Alles markieren" -#: ../src/interface.c:865 -#: ../src/interface.c:2370 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" @@ -1441,11 +1366,8 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:916 -#: ../src/interface.c:4302 -#: ../src/interface.c:5637 -#: ../src/keybindings.c:253 -#: ../src/prefs.c:1557 +#: ../src/interface.c:916 ../src/interface.c:4310 ../src/interface.c:5654 +#: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" @@ -1489,21 +1411,15 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:990 -#: ../src/interface.c:3894 -#: ../src/interface.c:5535 +#: ../src/interface.c:990 ../src/interface.c:3904 ../src/interface.c:5554 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:996 -#: ../src/interface.c:3885 -#: ../src/interface.c:5526 +#: ../src/interface.c:996 ../src/interface.c:3895 ../src/interface.c:5545 msgid "_Spaces" msgstr "_Leerzeichen" #: ../src/interface.c:1002 -#: ../src/interface.c:3903 -#: ../src/interface.c:5544 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" @@ -1655,8 +1571,7 @@ msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1271 -#: ../src/interface.c:1278 +#: ../src/interface.c:1271 ../src/interface.c:1278 msgid "_Help" msgstr "_Hilfe" @@ -1672,8 +1587,7 @@ msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1333 -#: ../src/sidebar.c:132 +#: ../src/interface.c:1333 ../src/sidebar.c:124 msgid "Symbols" msgstr "Symbole" @@ -1713,178 +1627,236 @@ msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2907 -#: ../src/keybindings.c:384 +#: ../src/interface.c:2908 ../src/keybindings.c:384 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2943 +#: ../src/interface.c:2944 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2946 +#: ../src/interface.c:2947 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2948 +#: ../src/interface.c:2949 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2950 -msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" -msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden." +#: ../src/interface.c:2951 +msgid "" +"Whether the virtual terminal emulation (VTE) should be loaded at startup, " +"disable it if you do not need it" +msgstr "" +"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " +"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " +"deaktiviert werden." -#: ../src/interface.c:2952 +#: ../src/interface.c:2953 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2956 +#: ../src/interface.c:2957 msgid "<b>Startup</b>" msgstr "<b>Starten</b>" -#: ../src/interface.c:2975 +#: ../src/interface.c:2976 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2978 +#: ../src/interface.c:2979 msgid "Saves the window position and geometry and restores it at the start" -msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her." +msgstr "" +"Speichert die Fensterposition und die Fenstergröße und stellt sie beim " +"nächsten Start wieder her." -#: ../src/interface.c:2980 +#: ../src/interface.c:2981 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2983 +#: ../src/interface.c:2984 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2985 +#: ../src/interface.c:2986 msgid "<b>Shutdown</b>" msgstr "<b>Beenden </b>" -#: ../src/interface.c:3006 +#: ../src/interface.c:3007 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3018 -msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." -msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." +#: ../src/interface.c:3019 +msgid "" +"Path to start in when opening or saving files. Must be an absolute path. " +"Leave blank to use the current working directory." +msgstr "" +"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " +"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " +"Sie das Feld leer." -#: ../src/interface.c:3031 +#: ../src/interface.c:3032 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3043 +#: ../src/interface.c:3044 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:3056 +#: ../src/interface.c:3057 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:3068 -msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." -msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." +#: ../src/interface.c:3069 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"Geany schaut standardmäßig im Installationsverzeichnis und im " +"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " +"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " +"ignoriert, falls es leer ist." -#: ../src/interface.c:3081 +#: ../src/interface.c:3082 msgid "<b>Paths</b>" msgstr "<b>Pfade</b>" -#: ../src/interface.c:3086 +#: ../src/interface.c:3087 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:3109 +#: ../src/interface.c:3110 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:3112 -msgid "Whether to beep if an error occurred or when the compilation process has finished" -msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" +#: ../src/interface.c:3113 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "" +"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " +"ausgegeben werden soll" -#: ../src/interface.c:3114 +#: ../src/interface.c:3115 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:3117 -msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" -msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" +#: ../src/interface.c:3118 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives" +msgstr "" +"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " +"wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:3119 +#: ../src/interface.c:3120 msgid "Suppress status messages in the status bar" msgstr "Meldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3122 -msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." -msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." +#: ../src/interface.c:3123 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " +"weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:3124 +#: ../src/interface.c:3125 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3127 -msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." -msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." +#: ../src/interface.c:3128 +msgid "" +"Gives the focus automatically to widgets below the mouse cursor. Works for " +"the main editor widget, the scribble, the toolbar search and goto line " +"fields and the VTE." +msgstr "" +"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " +"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " +"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " +"Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:3129 +#: ../src/interface.c:3130 msgid "Use Windows File Open/Save dialogs" msgstr "Benutze den Windows Datei öffnen/speichern Dialog" -#: ../src/interface.c:3132 -msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" -msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll." +#: ../src/interface.c:3133 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" +"Dialogs genutzt werden soll." -#: ../src/interface.c:3134 -#: ../src/interface.c:3370 -#: ../src/interface.c:4512 +#: ../src/interface.c:3135 ../src/interface.c:3371 ../src/interface.c:4520 msgid "<b>Miscellaneous</b>" msgstr "<b>Sonstiges</b>" -#: ../src/interface.c:3153 +#: ../src/interface.c:3154 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:3156 -msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" +#: ../src/interface.c:3157 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " +"Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:3158 +#: ../src/interface.c:3159 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:3161 -msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" -msgstr "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" +#: ../src/interface.c:3162 +msgid "" +"Use current word under the cursor when opening the Find, Find in Files or " +"Replace dialog and there is no selection" +msgstr "" +"Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" -#: ../src/interface.c:3163 +#: ../src/interface.c:3164 msgid "Use the current file's directory for Find in Files" msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen" -#: ../src/interface.c:3167 +#: ../src/interface.c:3168 msgid "<b>Search</b>" msgstr "<b>Suche</b>" -#: ../src/interface.c:3186 +#: ../src/interface.c:3187 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:3189 -msgid "Whether to store a project's session files and open them when re-opening the project" -msgstr "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" +#: ../src/interface.c:3190 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " +"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" -#: ../src/interface.c:3191 +#: ../src/interface.c:3192 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:3194 -msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." -msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +#: ../src/interface.c:3195 +msgid "" +"When enabled, a project file is stored by default inside the project base " +"directory when creating new projects instead of one directory above the base " +"directory. You can still change the path of the project file in the New " +"Project dialog." +msgstr "" +"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " +"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " +"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " +"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:3196 +#: ../src/interface.c:3197 msgid "<b>Projects</b>" msgstr "<b>Projekte</b>" -#: ../src/interface.c:3201 +#: ../src/interface.c:3202 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1892,973 +1864,1121 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3205 -#: ../src/prefs.c:1551 +#: ../src/interface.c:3206 ../src/prefs.c:1551 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3246 +#: ../src/interface.c:3247 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:3249 +#: ../src/interface.c:3250 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:3251 +#: ../src/interface.c:3252 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3254 +#: ../src/interface.c:3255 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:3256 +#: ../src/interface.c:3257 msgid "Show sidebar" msgstr "Seitenleiste anzeigen" -#: ../src/interface.c:3264 +#: ../src/interface.c:3265 msgid "Position:" msgstr "Position:" -#: ../src/interface.c:3268 -#: ../src/interface.c:3424 -#: ../src/interface.c:3485 -#: ../src/interface.c:3503 -#: ../src/interface.c:3521 +#: ../src/interface.c:3269 ../src/interface.c:3425 ../src/interface.c:3486 +#: ../src/interface.c:3504 ../src/interface.c:3522 msgid "Left" msgstr "Links" -#: ../src/interface.c:3275 -#: ../src/interface.c:3432 -#: ../src/interface.c:3486 -#: ../src/interface.c:3504 -#: ../src/interface.c:3522 +#: ../src/interface.c:3276 ../src/interface.c:3433 ../src/interface.c:3487 +#: ../src/interface.c:3505 ../src/interface.c:3523 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3281 +#: ../src/interface.c:3282 msgid "<b>Sidebar</b>" msgstr "<b>Seitenleiste</b>" -#: ../src/interface.c:3302 +#: ../src/interface.c:3303 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3309 -#: ../src/interface.c:3472 +#: ../src/interface.c:3310 ../src/interface.c:3473 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3316 -#: ../src/interface.c:3508 +#: ../src/interface.c:3317 ../src/interface.c:3509 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3328 +#: ../src/interface.c:3329 msgid "Sets the font for the message window" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5804] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5804 http://geany.svn.sourceforge.net/geany/?rev=5804&view=rev Author: statc Date: 2011-05-21 08:50:00 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5601..5620) Conflicts: src/filetypes.c Modified Paths: -------------- branches/sm/ChangeLog branches/sm/data/filetype_extensions.conf branches/sm/data/filetypes.Genie.conf branches/sm/data/filetypes.actionscript branches/sm/data/filetypes.ada branches/sm/data/filetypes.asm branches/sm/data/filetypes.c branches/sm/data/filetypes.caml branches/sm/data/filetypes.cmake branches/sm/data/filetypes.cobol branches/sm/data/filetypes.conf branches/sm/data/filetypes.cpp branches/sm/data/filetypes.cs branches/sm/data/filetypes.css branches/sm/data/filetypes.d branches/sm/data/filetypes.diff branches/sm/data/filetypes.docbook branches/sm/data/filetypes.erlang branches/sm/data/filetypes.f77 branches/sm/data/filetypes.ferite branches/sm/data/filetypes.forth branches/sm/data/filetypes.fortran branches/sm/data/filetypes.freebasic branches/sm/data/filetypes.glsl branches/sm/data/filetypes.haskell branches/sm/data/filetypes.haxe branches/sm/data/filetypes.html branches/sm/data/filetypes.java branches/sm/data/filetypes.javascript branches/sm/data/filetypes.latex branches/sm/data/filetypes.lisp branches/sm/data/filetypes.lua branches/sm/data/filetypes.makefile branches/sm/data/filetypes.matlab branches/sm/data/filetypes.nsis branches/sm/data/filetypes.pascal branches/sm/data/filetypes.perl branches/sm/data/filetypes.php branches/sm/data/filetypes.po branches/sm/data/filetypes.python branches/sm/data/filetypes.r branches/sm/data/filetypes.restructuredtext branches/sm/data/filetypes.ruby branches/sm/data/filetypes.sh branches/sm/data/filetypes.sql branches/sm/data/filetypes.tcl branches/sm/data/filetypes.vala branches/sm/data/filetypes.verilog branches/sm/data/filetypes.vhdl branches/sm/data/filetypes.xml branches/sm/data/filetypes.yaml branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/geany.glade branches/sm/plugins/filebrowser.c branches/sm/po/ChangeLog branches/sm/po/es.po branches/sm/po/sl.po branches/sm/src/callbacks.c branches/sm/src/document.c branches/sm/src/editor.c branches/sm/src/encodings.c branches/sm/src/encodings.h branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/interface.c branches/sm/src/main.c branches/sm/src/search.c branches/sm/src/templates.c branches/sm/tagmanager/diff.c Added Paths: ----------- branches/sm/data/filetypes.Scala.conf branches/sm/data/templates/files/main.vala Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) @@ -1,3 +1,64 @@ +2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/filebrowser.c: + Add history to filter entry. + + +2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> + + * doc/geany.txt, doc/geany.html: + Update the documentation to talk about real-time tag parsing. + + +2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/main.c: + Make --ft-names list filetypes alphabetically. + * plugins/filebrowser.c: + Allow multiple file filters to be separated by a space for + consistency with Find in Files file patterns. ';' is still + allowed also. + + +2011-03-20 Colomban Wendling <colomban(at)geany(dot)org> + + * data/filetypes.*, doc/geany.txt, doc/geany.html, src/callbacks.c, + src/filetypes.c, src/filetypes.h, src/templates.c: + Add new filetype setting "comment_single" to provide separated + single-line and multiline comment support. Single-line are used in + priority to comment code, and multiline to make template comments. + * src/editor.c, src/search.c, tagmanager/diff.c: + Don't use strlen(..) > 0 or == 0, simply check the first character + against 0. + * src/document.c: + Update forced indent settings when setting the filetype. This makes + documents created or set to a filetype with forced indent setting + (Makefile, F77) to have the correct setting right away. + + +2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> + + * src/callbacks.c: + Create a new undo action when inserting templates, making sure the user + can undo the template insertion without also undoing a previous action. + + +2011-03-18 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/encodings.c, src/encodings.h: + Move document encoding conversion with BOM support to encodings.[ch] as + encodings_convert_to_utf8_auto(). + * src/templates.c: + Properly convert template files to UTF-8 on loading, fixing encoding + issues if templates files are not encoded in UTF-8. + + +2011-03-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/templates/files/main.vala: + Add file template for Vala (patch by Mark Trompell, thanks). + + 2011-03-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c, src/utils.h, src/filetypes.c: @@ -8,12 +69,24 @@ Improve Class Builder plugin dialog UI using a table (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Fix GLib warning when creating classes and no documents are open + Fix GLib warning when creating classes and no documents are open (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Undo patch change to cc_option_label_new() to append a ':' colon to - label text because this unnecessarily causes string translations to + Undo patch change to cc_option_label_new() to append a ':' colon to + label text because this unnecessarily causes string translations to be updated. + * src/interface.c, geany.glade: + Fix wrong label capitalization for Toolbar Preferences dialog tab + and 2 other labels. + * data/filetypes.Scala.conf, data/filetype_extensions.conf: + Add Scala custom filetype, based on file by werg (thanks). + (This uses the newly added [styling=C] syntax). + * src/filetypes.c: + Make special case for filetypes.matlab instead of truncating all + filetype config filenames at slash. + * src/filetypes.c: + Fix generating tag files and --ft-names option by ensuring GTK is + initialized before calling ui_get_mime_icon(). 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -45,6 +45,7 @@ reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; +Scala=*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; Modified: branches/sm/data/filetypes.Genie.conf =================================================================== --- branches/sm/data/filetypes.Genie.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.Genie.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -42,10 +42,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -#comment_open=// -#comment_close= -# this is an alternative way, so multiline comments are used +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Added: branches/sm/data/filetypes.Scala.conf =================================================================== --- branches/sm/data/filetypes.Scala.conf (rev 0) +++ branches/sm/data/filetypes.Scala.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -0,0 +1,36 @@ +# Based on file by werg +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=abstract case catch class def do else extends false final finally for forSome if implicit import lazy match new object override package private protected requires return sealed throw trait true try type val var with while yield @ => + +secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List Option Some Stack String Unit Console Nil None Predef +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +lexer_filetype=C + +# default extension used when saving files +extension=scl + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +comment_use_indent=true + +#[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +#compiler=g++ -Wall -c "%f" +#linker=g++ -Wall -o "%e" "%f" +#run_cmd="./%e" Modified: branches/sm/data/filetypes.actionscript =================================================================== --- branches/sm/data/filetypes.actionscript 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.actionscript 2011-05-21 08:50:00 UTC (rev 5804) @@ -37,9 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.ada =================================================================== --- branches/sm/data/filetypes.ada 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ada 2011-05-21 08:50:00 UTC (rev 5804) @@ -26,9 +26,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.asm =================================================================== --- branches/sm/data/filetypes.asm 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.asm 2011-05-21 08:50:00 UTC (rev 5804) @@ -32,9 +32,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= +# single comments, like # in this file +comment_single=; +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.c =================================================================== --- branches/sm/data/filetypes.c 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.c 2011-05-21 08:50:00 UTC (rev 5804) @@ -46,12 +46,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.caml =================================================================== --- branches/sm/data/filetypes.caml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.caml 2011-05-21 08:50:00 UTC (rev 5804) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open=(* comment_close=*) Modified: branches/sm/data/filetypes.cmake =================================================================== --- branches/sm/data/filetypes.cmake 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cmake 2011-05-21 08:50:00 UTC (rev 5804) @@ -31,9 +31,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.cobol =================================================================== --- branches/sm/data/filetypes.cobol 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cobol 2011-05-21 08:50:00 UTC (rev 5804) @@ -25,9 +25,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=*> -comment_close= +# single comments, like # in this file +comment_single=*> +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.conf =================================================================== --- branches/sm/data/filetypes.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -20,9 +20,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.cpp =================================================================== --- branches/sm/data/filetypes.cpp 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cpp 2011-05-21 08:50:00 UTC (rev 5804) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.cs =================================================================== --- branches/sm/data/filetypes.cs 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cs 2011-05-21 08:50:00 UTC (rev 5804) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.css =================================================================== --- branches/sm/data/filetypes.css 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.css 2011-05-21 08:50:00 UTC (rev 5804) @@ -45,7 +45,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open=/* comment_close=*/ Modified: branches/sm/data/filetypes.d =================================================================== --- branches/sm/data/filetypes.d 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.d 2011-05-21 08:50:00 UTC (rev 5804) @@ -35,13 +35,12 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ -# this is alternative way, so multiline comments are used +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ +# or alternatively #comment_open=/+ #comment_close=+/ Modified: branches/sm/data/filetypes.diff =================================================================== --- branches/sm/data/filetypes.diff 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.diff 2011-05-21 08:50:00 UTC (rev 5804) @@ -19,8 +19,9 @@ #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # only the text before the first --- is a comment -comment_open= -comment_close= +#comment_single= +#comment_open= +#comment_close= # context action command (please see Geany's main documentation for details) context_action_cmd= Modified: branches/sm/data/filetypes.docbook =================================================================== --- branches/sm/data/filetypes.docbook 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.docbook 2011-05-21 08:50:00 UTC (rev 5804) @@ -47,7 +47,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: branches/sm/data/filetypes.erlang =================================================================== --- branches/sm/data/filetypes.erlang 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.erlang 2011-05-21 08:50:00 UTC (rev 5804) @@ -48,9 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.f77 =================================================================== --- branches/sm/data/filetypes.f77 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.f77 2011-05-21 08:50:00 UTC (rev 5804) @@ -33,9 +33,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=c -comment_close= +# single comments, like # in this file +comment_single=c +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.ferite =================================================================== --- branches/sm/data/filetypes.ferite 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ferite 2011-05-21 08:50:00 UTC (rev 5804) @@ -37,12 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.forth =================================================================== --- branches/sm/data/filetypes.forth 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.forth 2011-05-21 08:50:00 UTC (rev 5804) @@ -26,7 +26,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=\\ +# multiline comments comment_open=( comment_close= ) Modified: branches/sm/data/filetypes.fortran =================================================================== --- branches/sm/data/filetypes.fortran 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.fortran 2011-05-21 08:50:00 UTC (rev 5804) @@ -33,9 +33,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=! -comment_close= +# single comments, like # in this file +comment_single=! +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.freebasic =================================================================== --- branches/sm/data/filetypes.freebasic 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.freebasic 2011-05-21 08:50:00 UTC (rev 5804) @@ -37,12 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=' -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/' -#comment_close='/ +# single comments, like # in this file +comment_single=' +# multiline comments +comment_open=/' +comment_close='/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.glsl =================================================================== --- branches/sm/data/filetypes.glsl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.glsl 2011-05-21 08:50:00 UTC (rev 5804) @@ -51,12 +51,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.haskell =================================================================== --- branches/sm/data/filetypes.haskell 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.haskell 2011-05-21 08:50:00 UTC (rev 5804) @@ -31,9 +31,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.haxe =================================================================== --- branches/sm/data/filetypes.haxe 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.haxe 2011-05-21 08:50:00 UTC (rev 5804) @@ -38,9 +38,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.html =================================================================== --- branches/sm/data/filetypes.html 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.html 2011-05-21 08:50:00 UTC (rev 5804) @@ -16,8 +16,10 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: branches/sm/data/filetypes.java =================================================================== --- branches/sm/data/filetypes.java 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.java 2011-05-21 08:50:00 UTC (rev 5804) @@ -39,7 +39,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: branches/sm/data/filetypes.javascript =================================================================== --- branches/sm/data/filetypes.javascript 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.javascript 2011-05-21 08:50:00 UTC (rev 5804) @@ -36,9 +36,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.latex =================================================================== --- branches/sm/data/filetypes.latex 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.latex 2011-05-21 08:50:00 UTC (rev 5804) @@ -19,9 +19,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.lisp =================================================================== --- branches/sm/data/filetypes.lisp 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.lisp 2011-05-21 08:50:00 UTC (rev 5804) @@ -29,12 +29,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=#| -#comment_close=|# +# single comments, like # in this file +comment_single=; +# multiline comments +comment_open=#| +comment_close=|# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.lua =================================================================== --- branches/sm/data/filetypes.lua 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.lua 2011-05-21 08:50:00 UTC (rev 5804) @@ -44,12 +44,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=--[[ -#comment_close=]]-- +# single comments, like # in this file +comment_single=-- +# multiline comments +comment_open=--[[ +comment_close=]]-- # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.makefile =================================================================== --- branches/sm/data/filetypes.makefile 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.makefile 2011-05-21 08:50:00 UTC (rev 5804) @@ -19,9 +19,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.matlab =================================================================== --- branches/sm/data/filetypes.matlab 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.matlab 2011-05-21 08:50:00 UTC (rev 5804) @@ -22,9 +22,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.nsis =================================================================== --- branches/sm/data/filetypes.nsis 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.nsis 2011-05-21 08:50:00 UTC (rev 5804) @@ -40,9 +40,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= +# single comments, like # in this file +comment_single=; +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.pascal =================================================================== --- branches/sm/data/filetypes.pascal 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.pascal 2011-05-21 08:50:00 UTC (rev 5804) @@ -33,7 +33,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open={ comment_close=} Modified: branches/sm/data/filetypes.perl =================================================================== --- branches/sm/data/filetypes.perl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.perl 2011-05-21 08:50:00 UTC (rev 5804) @@ -52,9 +52,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open==begin +#comment_close==cut # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.php =================================================================== --- branches/sm/data/filetypes.php 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.php 2011-05-21 08:50:00 UTC (rev 5804) @@ -12,8 +12,10 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: branches/sm/data/filetypes.po =================================================================== --- branches/sm/data/filetypes.po 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.po 2011-05-21 08:50:00 UTC (rev 5804) @@ -21,9 +21,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.python =================================================================== --- branches/sm/data/filetypes.python 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.python 2011-05-21 08:50:00 UTC (rev 5804) @@ -37,9 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comment char, like # in this file +comment_single=# +# multiline comments +#comment_open=""" +#comment_close=""" # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.r =================================================================== --- branches/sm/data/filetypes.r 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.r 2011-05-21 08:50:00 UTC (rev 5804) @@ -32,12 +32,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.restructuredtext =================================================================== --- branches/sm/data/filetypes.restructuredtext 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.restructuredtext 2011-05-21 08:50:00 UTC (rev 5804) @@ -9,12 +9,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=.. +# single comments, like # in this file +comment_single=.. +# multiline comments +#comment_open= #comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.ruby =================================================================== --- branches/sm/data/filetypes.ruby 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ruby 2011-05-21 08:50:00 UTC (rev 5804) @@ -49,9 +49,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open==begin +#comment_close==end # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.sh =================================================================== --- branches/sm/data/filetypes.sh 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.sh 2011-05-21 08:50:00 UTC (rev 5804) @@ -27,9 +27,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start a column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.sql =================================================================== --- branches/sm/data/filetypes.sql 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.sql 2011-05-21 08:50:00 UTC (rev 5804) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=-- +# multiline comments comment_open=/* comment_close=*/ Modified: branches/sm/data/filetypes.tcl =================================================================== --- branches/sm/data/filetypes.tcl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.tcl 2011-05-21 08:50:00 UTC (rev 5804) @@ -34,9 +34,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.vala =================================================================== --- branches/sm/data/filetypes.vala 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.vala 2011-05-21 08:50:00 UTC (rev 5804) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.verilog =================================================================== --- branches/sm/data/filetypes.verilog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.verilog 2011-05-21 08:50:00 UTC (rev 5804) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: branches/sm/data/filetypes.vhdl =================================================================== --- branches/sm/data/filetypes.vhdl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.vhdl 2011-05-21 08:50:00 UTC (rev 5804) @@ -34,9 +34,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: branches/sm/data/filetypes.xml =================================================================== --- branches/sm/data/filetypes.xml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.xml 2011-05-21 08:50:00 UTC (rev 5804) @@ -88,7 +88,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: branches/sm/data/filetypes.yaml =================================================================== --- branches/sm/data/filetypes.yaml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.yaml 2011-05-21 08:50:00 UTC (rev 5804) @@ -25,9 +25,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Added: branches/sm/data/templates/files/main.vala =================================================================== --- branches/sm/data/templates/files/main.vala (rev 0) +++ branches/sm/data/templates/files/main.vala 2011-05-21 08:50:00 UTC (rev 5804) @@ -0,0 +1,9 @@ +{fileheader} + +class {untitled} : GLib.Object { + + public static int main(string[] args) { + + return 0; + } +} Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/doc/geany.html 2011-05-21 08:50:00 UTC (rev 5804) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2011-01-19" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2011-01-19</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.21</td></tr> </tbody> @@ -1909,10 +1909,11 @@ tags files, as described below.</p> <div class="section" id="workspace-tags"> <h3><a class="toc-backref" href="#id78">Workspace tags</a></h3> -<p>Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype.</p> +<p>Tags for each document are parsed whenever a file is loaded, saved or +modified (see <em>Symbol list update frequency</em> preference in the <a class="reference internal" href="#editor-completions-preferences">Editor +Completions preferences</a>). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See <a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> @@ -2428,6 +2429,17 @@ <dd>The number of rows to display for the autocompletion window.</dd> <dt>Max. symbol name suggestions</dt> <dd>The maximum number of items in the autocompletion list.</dd> +<dt>Symbol list update frequency</dt> +<dd><p class="first">The minimum delay (in milliseconds) between two symbol list updates.</p> +<p>This option determines how frequently the tag list is updated for the +current document. The smaller the delay, the more up-to-date the symbol +list (and then the completions); but rebuilding the symbol list has a +cost in performance, especially with large files.</p> +<p>The default value is 250ms, which means the symbol list will be updated +at most four times per second, even if the document changes continuously.</p> +<p class="last">A value of 0 disables automatic updates, so the symbol list will only be +updated upon document saving.</p> +</dd> </dl> </div> <div class="section" id="auto-close-quotes-and-brackets"> @@ -4463,10 +4475,20 @@ filetypes.common setting.</p> </div> </dd> +<dt>comment_single</dt> +<dd><p class="first">A character or string which is used to comment code. If you want to use +multiline comments only, don't set this but rather comment_open and +comment_close.</p> +<p>Single-line comments are used in priority over multiline comments to +comment a line, e.g. with the <cite>Comment/Uncomment line</cite> command.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">comment_single=//</span></tt></p> +</dd> <dt>comment_open</dt> -<dd><p class="first">A character or string which is used to comment code. If you want to -use multiline comments, also set comment_close, otherwise leave it -empty.</p> +<dd><p class="first">A character or string which is used to comment code. You need to also +set comment_close to really use multiline comments. If you want to use +single-line comments, prefer setting comment_single.</p> +<p>Multiline comments are used in priority over single-line comments to +comment a block, e.g. template comments.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">comment_open=/*</span></tt></p> </dd> <dt>comment_close</dt> @@ -6461,7 +6483,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-02-06 16:10 UTC. +Generated on: 2011-03-24 02:06 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: branches/sm/doc/geany.txt =================================================================== --- branches/sm/doc/geany.txt 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/doc/geany.txt 2011-05-21 08:50:00 UTC (rev 5804) @@ -1505,10 +1505,11 @@ Workspace tags ^^^^^^^^^^^^^^ -Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype. +Tags for each document are parsed whenever a file is loaded, saved or +modified (see *Symbol list update frequency* preference in the `Editor +Completions preferences`_). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype. The *Go to Tag* commands can be used with all workspace tags. See `Go to tag definition`_. @@ -2090,7 +2091,21 @@ Max. symbol name suggestions The maximum number of items in the autocompletion list. +Symbol list update frequency + The minimum delay (in milliseconds) between two symbol list updates. + This option determines how frequently the tag list is updated for the + current document. The smaller the delay, the more up-to-date the symbol + list (and then the completions); but rebuilding the symbol list has a + cost in performance, especially with large files. + + The default value is 250ms, which means the symbol list will be updated + at most four times per second, even if the document changes continuously. + + A value of 0 disables automatic updates, so the symbol list will only be + updated upon document saving. + + Auto-close quotes and brackets `````````````````````````````` @@ -3749,11 +3764,24 @@ This can be overridden by the *whitespace_chars* filetypes.common setting. +comment_single + A character or string which is used to comment code. If you want to use + multiline comments only, don't set this but rather comment_open and + comment_close. + + Single-line comments are used in priority over multiline comments to + comment a line, e.g. with the `Comment/Uncomment line` command. + + *Example:* ``comment_single=//`` + comment_open - A character or string which is used to comment code. If you want to - use multiline comments, also set comment_close, otherwise leave it - empty. + A character or string which is used to comment code. You need to also + set comment_close to really use multiline comments. If you want to use + single-line comments, prefer setting comment_single. + Multiline comments are used in priority over single-line comments to + comment a block, e.g. template comments. + *Example:* ``comment_open=/*`` comment_close Modified: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/geany.glade 2011-05-21 08:50:00 UTC (rev 5804) @@ -5221,7 +5221,7 @@ <widget class="GtkCheckButton" id="check_toolbar_show"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Show T_oolbar</property> + <property name="label" translatable="yes">Show t_oolbar</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5241,7 +5241,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Pack the toolbar to the main menu to save vertical space</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Append Toolbar to the Menu</property> + <property name="label" translatable="yes">_Append toolbar to the menu</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5398,7 +5398,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_style_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">System _Default</property> + <property name="label" translatable="yes">System _default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5420,7 +5420,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_imagetext"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Images _and Text</property> + <property name="label" translatable="yes">Images _and text</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5443,7 +5443,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_image"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Images Only</property> + <property name="label" translatable="yes">_Images only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5466,7 +5466,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_text"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Text Only</property> + <property name="label" translatable="yes">_Text only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5492,7 +5492,7 @@ <child> <widget class="GtkLabel" id="label244"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Icon Style</b></property> + <property name="label" translatable="yes"><b>Icon style</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -5551,7 +5551,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_icon_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">S_ystem Default</property> + <property name="label" translatable="yes">S_ystem default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5573,7 +5573,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_small"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Small Icons</property> + <property name="label" translatable="yes">_Small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5596,7 +5596,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_verysmall"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Very Small Icons</property> + <property name="label" translatable="yes">_Very small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5619,7 +5619,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_large"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Large Icons</property> + <property name="label" translatable="yes">_Large icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5645,7 +5645,7 @@ <child> <widget class="GtkLabel" id="label245"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Icon Size</b></property> + <property name="label" translatable="yes"><b>Icon size</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6355,7 +6355,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -9320,7 +9320,7 @@ <child> <widget class="GtkLabel" id="label218"> <property name="visible">True</property> - <property name="label" translatable="yes">Date & Time:</property> + <property name="label" translatable="yes">Date & time:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10345,7 +10345,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:50:00 UTC (rev 5804) @@ -74,6 +74,7 @@ static GtkTreeIter *last_dir_iter = NULL; static GtkEntryCompletion *entry_completion = NULL; +static GtkWidget *filter_combo; static GtkWidget *filter_entry; static GtkWidget *path_combo; static GtkWidget *path_entry; @@ -160,10 +161,10 @@ { gchar **filter_item; guint len; - + if (filter == NULL) return FALSE; - + len = g_strv_length(filter); foreach_c_array(filter_item, filter, len) { @@ -785,21 +786,24 @@ } -static void on_path_combo_changed(GtkComboBox *combo, gpointer user_data) +static void ui_combo_box_changed(GtkComboBox *combo, gpointer user_data) { /* we get this callback on typing as well as choosing an item */ if (gtk_combo_box_get_active(combo) >= 0) - on_path_entry_activate(GTK_ENTRY(path_entry), NULL); + gtk_widget_activate(GTK_BIN(combo)->child); } static void on_filter_activate(GtkEntry *entry, gpointer user_data) { - filter = g_strsplit(gtk_entry_get_text(entry), ";", -1); + /* We use spaces for consistency with Find in Files file patterns + * ';' also supported like original patch. */ + filter = g_strsplit_set(gtk_entry_get_text(entry), "; ", -1); if (filter == NULL || g_strv_length(filter) == 0) { clear_filter(); } + ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(filter_combo), NULL, 0); refresh(); } @@ -903,7 +907,8 @@ label = gtk_label_new(_("Filter:")); - filter_entry = gtk_entry_new(); + filter_combo = gtk_combo_box_entry_new_text(); + filter_entry = GTK_BIN(filter_combo)->child; if (gtk_check_version(2, 15, 2) == NULL) { @@ -911,11 +916,12 @@ g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); } ui_widget_set_tooltip_text(filter_entry, - _("Filter your files with usual wildcards, separate multiple filters with \";\"")); + _("Filter your files with the usual wildcards. Separate multiple patterns with a space.")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); + g_signal_connect(filter_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(filterbar), filter_entry, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(filterbar), filter_combo, TRUE, TRUE, 0); return filterbar; } @@ -1095,7 +1101,7 @@ GtkWidget *scrollwin, *toolbar, *filterbar; filter = NULL; - + file_view_vbox = gtk_vbox_new(FALSE, 0); toolbar = make_toolbar(); gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0); @@ -1105,7 +1111,7 @@ path_combo = gtk_combo_box_entry_new_text(); gtk_box_pack_start(GTK_BOX(file_view_vbox), path_combo, FALSE, FALSE, 2); - g_signal_connect(path_combo, "changed", G_CALLBACK(on_path_combo_changed), NULL); + g_signal_connect(path_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); path_entry = GTK_BIN(path_combo)->child; g_signal_connect(path_entry, "activate", G_CALLBACK(on_path_entry_activate), NULL); Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/po/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) @@ -1,3 +1,14 @@ +2011-03-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sl.po: Fix of a typo inside Slovenian translation. Thanks to Jože Klepec. + + +2011-03-21 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * es.po: Update of Spanish translation. Thanks to Lucas Vieites. + (closes #3222844) + + 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * zh_TW.po: Update of traditional Chinese translation. Modified: branches/sm/po/es.po =================================================================== --- branches/sm/po/es.po 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/po/es.po 2011-05-21 08:50:00 UTC (rev 5804) @@ -1,18 +1,17 @@ # translation of es.po to -# Spanish translation file for Geany 0.19 +# Spanish translation file for Geany 0.20 # This file is distributed under the same license as the geany package. # Damián Viano <des(a)damianv.com.ar>, 2006, 2007. # Antonio Jiménez González <ajimenez(a)linuxmail.org>, 2009 - 2010. -# Lucas Vieites <lucasvieites(a)gmail.com>, 2010. - +# Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2011. msgid "" msgstr "" "Project-Id-Version: Geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-05 15:55+0100\n" -"PO-Revision-Date: 2010-12-07 18:38+0100\n" -"Last-Translator: lucasvieites(a)gmail.com\n" -"Language-Team: <es(a)li.org>\n" +"POT-Creation-Date: 2011-03-21 20:00+0100\n" +"PO-Revision-Date: 2011-03-18 15:33+0100\n" +"Last-Translator: Lucas Vieites <lucas.vieites(a)gmail.com>\n" +"Language-Team: Español <es(a)li.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +23,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE rápido y ligero para GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:309 ../src/interface.c:1806 +#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -32,53 +31,53 @@ msgid "Integrated Development Environment" msgstr "Entorno de desarrollo integrado" -#: ../src/about.c:152 +#: ../src/about.c:154 msgid "About Geany" msgstr "Acerca de Geany" -#: ../src/about.c:202 +#: ../src/about.c:204 msgid "A fast and lightweight IDE" msgstr "Un IDE rápido y ligero" -#: ../src/about.c:223 +#: ../src/about.c:225 #, c-format msgid "(built on or after %s)" msgstr "(compilado el día %s o después)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:254 +#: ../src/about.c:256 msgid "Info" msgstr "Información" -#: ../src/about.c:270 +#: ../src/about.c:272 msgid "Developers" msgstr "Desarrolladores" -#: ../src/about.c:279 +#: ../src/about.c:281 msgid "maintainer" msgstr "mantenedor" -#: ../src/about.c:287 +#: ../src/about.c:289 ../src/about.c:297 msgid "developer" msgstr "desarrollador" -#: ../src/about.c:295 +#: ../src/about.c:305 msgid "translation maintainer" msgstr "mantenedor de traducción" -#: ../src/about.c:304 +#: ../src/about.c:314 msgid "Translators" msgstr "Traductores" -#: ../src/about.c:324 +#: ../src/about.c:334 msgid "Previous Translators" msgstr "Traductores anteriores" -#: ../src/about.c:345 +#: ../src/about.c:355 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:355 +#: ../src/about.c:365 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -86,15 +85,15 @@ "Algunos de los muchos colaboradores (vea el archivo %s para una lista más " "detallada):" -#: ../src/about.c:381 +#: ../src/about.c:391 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:395 +#: ../src/about.c:405 msgid "License" msgstr "Licencia" -#: ../src/about.c:404 +#: ../src/about.c:414 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -117,29 +116,29 @@ msgid "%s (in directory: %s)" msgstr "%s (en el directorio: %s)" -#: ../src/build.c:739 ../src/build.c:964 ../src/search.c:1486 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1524 #, c-format msgid "Process failed (%s)" msgstr "El proceso ha fallado (%s)" -#: ../src/build.c:810 +#: ../src/build.c:807 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Error al cambiar el directorio de trabajo a «%s»" -#: ../src/build.c:839 +#: ../src/build.c:836 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Error al ejecutar «%s» (no se ha podido crear el script de inicio)" -#: ../src/build.c:893 +#: ../src/build.c:890 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "No se ha podido ejecutar el archivo en la terminal virtual (VTE) " "probablemente porque contiene un comando." -#: ../src/build.c:931 +#: ../src/build.c:928 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -148,81 +147,77 @@ "No se ha podido encontrar la terminal «%s» (verifique la ruta de la " "herramienta de terminal en «Preferencias»)" -#: ../src/build.c:1104 +#: ../src/build.c:1101 msgid "Compilation failed." msgstr "Ha fallado la compilación." -#: ../src/build.c:1118 +#: ../src/build.c:1115 msgid "Compilation finished successfully." msgstr "La compilación ha terminado con éxito." -#: ../src/build.c:1277 +#: ../src/build.c:1274 msgid "Custom Text" msgstr "Texto personalizado" -#: ../src/build.c:1278 +#: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." msgstr "Introduzca su texto personalizado, éste se añadirá al comando." -#: ../src/build.c:1356 +#: ../src/build.c:1353 msgid "_Next Error" msgstr "Siguie_nte error" -#: ../src/build.c:1358 +#: ../src/build.c:1355 msgid "_Previous Error" msgstr "Error _anterior" -#: ../src/build.c:1368 +#: ../src/build.c:1365 msgid "_Set Build Commands" msgstr "Establecer comando_s de construcción" -#: ../src/build.c:1652 ../src/toolbar.c:373 +#: ../src/build.c:1649 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Construir el archivo actual" -#: ../src/build.c:1666 +#: ../src/build.c:1663 msgid "Build the current file with Make and the default target" msgstr "Construir el archivo actual con «make» y el objetivo predeterminado" -#: ../src/build.c:1668 +#: ../src/build.c:1665 msgid "Build the current file with Make and the specified target" msgstr "Construir el archivo actual con «make» y el objetivo indicado" -#: ../src/build.c:1670 +#: ../src/build.c:1667 msgid "Compile the current file with Make" msgstr "Compilar el archivo actual con «make»" -#: ../src/build.c:1697 +#: ../src/build.c:1694 #, c-format msgid "Process could not be stopped (%s)." msgstr "No se ha podido detener el proceso (%s)." -#: ../src/build.c:1714 ../src/build.c:1726 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "No hay más errores de construcción." #. FIXME: we should pass either build dialog or project dialog instead of NULL for parent -#: ../src/build.c:1822 +#: ../src/build.c:1819 msgid "Set menu item label" msgstr "Establecer etiqueta del elemento de menú" -#: ../src/build.c:1847 -msgid "Item" -msgstr "Elem." - -#: ../src/build.c:1848 ../src/symbols.c:650 +#: ../src/build.c:1845 ../src/symbols.c:737 msgid "Label" msgstr "Etiqueta" -#: ../src/build.c:1849 ../src/symbols.c:645 +#: ../src/build.c:1846 ../src/symbols.c:732 msgid "Command" msgstr "Comando" -#: ../src/build.c:1850 +#: ../src/build.c:1847 msgid "Working directory" msgstr "Directorio de trabajo" -#: ../src/build.c:1851 +#: ../src/build.c:1848 msgid "Clear" msgstr "Limpiar" @@ -247,15 +242,15 @@ msgid "Independent Commands" msgstr "Comandos independientes" -#: ../src/build.c:2043 +#: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "Nota: El elemento 2 abre un diálogo y añade la respuesta al comando." -#: ../src/build.c:2052 +#: ../src/build.c:2054 msgid "Execute Commands" msgstr "Ejecutar comandos" -#: ../src/build.c:2063 +#: ../src/build.c:2066 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " @@ -264,44 +259,44 @@ "Los comodines %d, %e, %f y %p se sustituirán en los campos de comandos y " "directorios. Consulte el manual para más información." -#: ../src/build.c:2223 +#: ../src/build.c:2226 msgid "Set Build Commands" msgstr "Establecer los comandos de construcción" -#: ../src/build.c:2434 +#: ../src/build.c:2437 msgid "_Compile" msgstr "_Compilar" #. build the code -#: ../src/build.c:2441 ../src/build.c:2703 ../src/interface.c:1218 +#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 msgid "_Build" msgstr "Con_struir" -#: ../src/build.c:2448 ../src/build.c:2478 ../src/build.c:2671 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 msgid "_Execute" msgstr "_Ejecutar" #. build the code with make custom -#: ../src/build.c:2493 ../src/build.c:2669 ../src/build.c:2723 +#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Compilar obje_tivo personalizado" #. build the code with make object -#: ../src/build.c:2495 ../src/build.c:2670 ../src/build.c:2731 +#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 msgid "Make _Object" msgstr "Compilar _objeto" -#: ../src/build.c:2497 ../src/build.c:2668 +#: ../src/build.c:2500 ../src/build.c:2671 msgid "_Make" msgstr "_Compilar" #. build the code with make all -#: ../src/build.c:2715 +#: ../src/build.c:2718 msgid "_Make All" msgstr "_Compilar todo" #. arguments -#: ../src/build.c:2743 +#: ../src/build.c:2746 msgid "_Set Build Menu Commands" msgstr "Establecer comando_s del menú «Construir»" @@ -316,8 +311,8 @@ msgstr[0] "%d archivo guardado." msgstr[1] "%d archivos guardados." -#: ../src/callbacks.c:490 ../src/document.c:2996 ../src/interface.c:380 -#: ../src/sidebar.c:683 +#: ../src/callbacks.c:490 ../src/document.c:2859 ../src/interface.c:381 +#: ../src/sidebar.c:695 msgid "_Reload" msgstr "_Recargar" @@ -330,7 +325,7 @@ msgid "Are you sure you want to reload '%s'?" msgstr "¿Está seguro que quiere recargar «%s»?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:424 +#: ../src/callbacks.c:1196 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Ir a línea" @@ -338,46 +333,46 @@ msgid "Enter the line you want to go to:" msgstr "Introduzca un número de línea:" -#: ../src/callbacks.c:1291 ../src/callbacks.c:1316 +#: ../src/callbacks.c:1291 ../src/callbacks.c:1318 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Seleccione el tipo de archivo para el archivo actual antes de utilizar esta " "función." -#: ../src/callbacks.c:1424 ../src/ui_utils.c:619 +#: ../src/callbacks.c:1434 ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1426 ../src/ui_utils.c:620 +#: ../src/callbacks.c:1436 ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1428 ../src/ui_utils.c:621 +#: ../src/callbacks.c:1438 ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1430 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1440 ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1432 ../src/ui_utils.c:631 +#: ../src/callbacks.c:1442 ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh:mm:ss" -#: ../src/callbacks.c:1434 ../src/ui_utils.c:632 +#: ../src/callbacks.c:1444 ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1436 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1446 ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "_Usar formato de fecha personalizado" -#: ../src/callbacks.c:1440 +#: ../src/callbacks.c:1450 msgid "Custom Date Format" msgstr "Formato de fecha personalizado" -#: ../src/callbacks.c:1441 +#: ../src/callbacks.c:1451 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -386,17 +381,17 @@ "cualquier especificador de conversión que pueda ser usado con la función " "strftime de ANSI C." -#: ../src/callbacks.c:1462 +#: ../src/callbacks.c:1474 msgid "Date format string could not be converted (possibly too long)." msgstr "" "No se ha podido convertir el formato de fecha (probablemente sea demasiado " "largo)." -#: ../src/callbacks.c:1688 ../src/callbacks.c:1698 +#: ../src/callbacks.c:1702 ../src/callbacks.c:1712 msgid "No more message items." msgstr "No hay más elementos de mensajes." -#: ../src/dialogs.c:178 ../src/interface.c:3873 ../src/interface.c:5492 +#: ../src/dialogs.c:178 ../src/interface.c:3912 ../src/interface.c:5553 msgid "Detect from file" msgstr "Detectar desde archivo" @@ -430,7 +425,7 @@ msgid "Open File" msgstr "Abrir archivo" -#: ../src/dialogs.c:243 ../src/interface.c:868 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "_Ver" @@ -566,12 +561,12 @@ #: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 #: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 -#: ../src/symbols.c:1751 ../src/symbols.c:1772 ../src/symbols.c:1824 +#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "desconocido" -#: ../src/dialogs.c:1191 ../src/symbols.c:800 +#: ../src/dialogs.c:1191 ../src/symbols.c:887 msgid "Properties" msgstr "Propiedades" @@ -661,14 +656,27 @@ msgid "New file \"%s\" opened." msgstr "Se ha abierto un archivo nuevo: «%s»." -#: ../src/document.c:967 ../src/document.c:1485 +#: ../src/document.c:845 ../src/document.c:1343 #, c-format msgid "Could not open file %s (%s)" msgstr "No se ha podido abrir el archivo %s (%s)" -#: ../src/document.c:997 +#: ../src/document.c:865 #, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "El archivo «%s» no es %s válido." + +#: ../src/document.c:871 +#, c-format msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"El archivo «%s» no parece ser de texto o la codificación no es conocida." + +#: ../src/document.c:881 +#, c-format +msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " "can occur if the file contains a NULL byte. Be aware that saving it can " "cause data loss.\n" @@ -679,45 +687,30 @@ "puede provocar la pérdida de datos.\n" "El archivo se ha abierto como sólo lectura." -#. For translators: the second wildcard is an encoding name, e.g. -#. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1023 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "El archivo «%s» no es %s válido." - -#: ../src/document.c:1033 -#, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"El archivo «%s» no parece ser de texto o la codificación no es conocida." - -#: ../src/document.c:1184 +#: ../src/document.c:1042 msgid "Spaces" msgstr "Espacios" -#: ../src/document.c:1187 +#: ../src/document.c:1045 msgid "Tabs" msgstr "Tabulaciones" -#: ../src/document.c:1190 +#: ../src/document.c:1048 msgid "Tabs and Spaces" msgstr "Tabulaciones y espacios" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1195 +#: ../src/document.c:1053 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Estableciendo modo de sangría %s para %s." -#: ../src/document.c:1248 +#: ../src/document.c:1106 ../src/document.c:1716 msgid "Invalid filename" msgstr "Nombre de archivo inválido" -#: ../src/document.c:1363 +#: ../src/document.c:1221 #, c-format msgid "File %s reloaded." msgstr "Archivo %s recargado." @@ -725,20 +718,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1368 +#: ../src/document.c:1226 #, c-format msgid "File %s opened(%d%s)." msgstr "Archivo %s abierto(%d%s)" -#: ../src/document.c:1370 +#: ../src/document.c:1228 msgid ", read-only" msgstr ", sólo lectura" -#: ../src/document.c:1579 +#: ../src/document.c:1437 msgid "Error renaming file." msgstr "Error al renombrar el archivo." -#: ../src/document.c:1666 +#: ../src/document.c:1524 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -747,7 +740,7 @@ "Ocurrió un error mientras se convertía el archivo desde UTF-8 en «%s». El " "archivo no fue guardado." -#: ../src/document.c:1688 +#: ../src/document.c:1546 #, c-format msgid "" "Error message: %s\n" @@ -756,39 +749,36 @@ "Mensaje de error: %s\n" "El error ocurrió en «%s»(línea: %d, columna: %d)." -#: ../src/document.c:1693 +#: ../src/document.c:1551 #, c-format msgid "Error message: %s." msgstr "Mensaje de error: %s." -#: ../src/document.c:1743 +#: ../src/document.c:1601 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" msgstr "" -"Ha ocurrido un error al abrir el archivo «%s» para escritura: ha fallado fopen" -"(): %s" +"Ha ocurrido un error al abrir el archivo «%s» para escritura: ha fallado " +"fopen(): %s" -#: ../src/document.c:1761 +#: ../src/document.c:1619 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" msgstr "" "Ha ocurrido un error al escribir el archivo «%s»: ha fallado fwrite(): %s" -#: ../src/document.c:1775 +#: ../src/document.c:1633 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Ha ocurrido un error al cerrar el archivo «%s»: ha fallado fclose(): %s" +msgstr "" +"Ha ocurrido un error al cerrar el archivo «%s»: ha fallado fclose(): %s" -#: ../src/document.c:1855 ../src/document.c:1927 -msgid "Error saving file." -msgstr "Error guardando archivo." - -#: ../src/document.c:1920 +#: ../src/document.c:1716 ../src/document.c:1781 #, c-format msgid "Error saving file (%s)." msgstr "Error al guardar archivo (%s)." -#: ../src/document.c:1925 +#: ../src/document.c:1786 #, c-format msgid "" "%s\n" @@ -799,38 +789,42 @@ "\n" "El archivo en el disco podría estar truncado." -#: ../src/document.c:1951 +#: ../src/document.c:1788 +msgid "Error saving file." +msgstr "Error guardando archivo." + +#: ../src/document.c:1812 #, c-format msgid "File %s saved." msgstr "Archivo %s guardado." -#: ../src/document.c:2019 ../src/document.c:2076 ../src/document.c:2084 +#: ../src/document.c:1880 ../src/document.c:1937 ../src/document.c:1945 #, c-format msgid "\"%s\" was not found." msgstr "no se ha encontrado «%s»." -#: ../src/document.c:2084 +#: ../src/document.c:1945 msgid "Wrap search and find again?" msgstr "¿Volver al principio y buscar de nuevo?" -#: ../src/document.c:2163 ../src/search.c:1146 ../src/search.c:1190 -#: ../src/search.c:1882 ../src/search.c:1883 +#: ../src/document.c:2024 ../src/search.c:1185 ../src/search.c:1229 +#: ../src/search.c:1920 ../src/search.c:1921 #, c-format msgid "No matches found for \"%s\"." msgstr "No se encontraron coincidencias para «%s»." -#: ../src/document.c:2174 ../src/document.c:2183 +#: ../src/document.c:2035 ../src/document.c:2044 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: se reemplazó %d ocurrencia de «%s» con «%s»." msgstr[1] "%s: se reemplazaron %d ocurrencias de «%s» con «%s»." -#: ../src/document.c:2997 +#: ../src/document.c:2860 msgid "Do you want to reload it?" msgstr "¿Quiere recargarlo?" -#: ../src/document.c:2998 +#: ../src/document.c:2861 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -839,30 +833,30 @@ "El archivo «%s» del disco es más reciente\n" "que la vista actual." -#: ../src/document.c:3016 +#: ../src/document.c:2879 msgid "Close _without saving" msgstr "Cerrar _sin guardar" -#: ../src/document.c:3019 +#: ../src/document.c:2882 msgid "Try to resave the file?" msgstr "¿Desea intentar volver a guardar el archivo?" -#: ../src/document.c:3020 +#: ../src/document.c:2883 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "No se ha encontrado el archivo «%s» en el disco." -#: ../src/editor.c:4326 +#: ../src/editor.c:4382 msgid "Enter Tab Width" msgstr "Introduzca el ancho de tabulación:" -#: ../src/editor.c:4327 +#: ../src/editor.c:4383 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Introduzca la cantidad de espacios que deberían ser reemplazados por una " "tabulación." -#: ../src/editor.c:4477 +#: ../src/editor.c:4533 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Advertencia: ancho de tabulación dura no estándar: %d != 8" @@ -1006,8 +1000,8 @@ msgid "%s file" msgstr "Archivo %s" -#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3816 -#: ../src/interface.c:5435 +#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3855 +#: ../src/interface.c:5496 msgid "None" msgstr "Ninguno" @@ -1031,50 +1025,50 @@ msgid "SQL Dump file" msgstr "Archivo de volcado SQL" -#: ../src/filetypes.c:398 +#: ../src/filetypes.c:405 msgid "Config file" msgstr "Archivo de configuración" -#: ../src/filetypes.c:404 +#: ../src/filetypes.c:411 msgid "Gettext translation file" msgstr "Archivo de traducción gettext" -#: ../src/filetypes.c:427 +#: ../src/filetypes.c:434 #, c-format msgid "%s script file" msgstr "Archivo de script %s" -#: ../src/filetypes.c:661 +#: ../src/filetypes.c:667 msgid "_Programming Languages" msgstr "Lenguajes de _programación" -#: ../src/filetypes.c:662 +#: ../src/filetypes.c:668 msgid "_Scripting Languages" msgstr "Lenguajes de _script" -#: ../src/filetypes.c:663 +#: ../src/filetypes.c:669 msgid "_Markup Languages" msgstr "Lenguajes de _etiquetas" -#: ../src/filetypes.c:664 +#: ../src/filetypes.c:670 msgid "M_iscellaneous Languages" msgstr "Lenguajes var_ios" -#: ../src/filetypes.c:665 +#: ../src/filetypes.c:671 msgid "_Custom Filetypes" msgstr "_Tipos de archivo personalizados" -#: ../src/filetypes.c:1281 ../src/win32.c:105 +#: ../src/filetypes.c:1373 ../src/win32.c:105 msgid "All Source" msgstr "Todo código fuente" #. create meta file filter "All files" -#: ../src/filetypes.c:1306 ../src/project.c:288 ../src/win32.c:95 +#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95 #: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Todos los archivos" -#: ../src/filetypes.c:1364 +#: ../src/filetypes.c:1456 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresión regular incorrecta para el tipo de archivo %s: %s" @@ -1083,565 +1077,565 @@ msgid "untitled" msgstr "sin título" -#: ../src/highlighting.c:3595 ../src/main.c:814 ../src/socket.c:165 -#: ../src/templates.c:315 +#: ../src/highlighting.c:3621 ../src/main.c:815 ../src/socket.c:165 +#: ../src/templates.c:327 #, c-format msgid "Could not find file '%s'." msgstr "No se ha podido encontrar el archivo «%s»." -#: ../src/highlighting.c:3615 +#: ../src/highlighting.c:3641 msgid "_Default" msgstr "Pre_determinado" -#: ../src/highlighting.c:3656 +#: ../src/highlighting.c:3682 msgid "_Color Schemes" msgstr "Esquemas de _color" -#: ../src/interface.c:323 +#: ../src/interface.c:324 msgid "_File" msgstr "_Archivo" -#: ../src/interface.c:334 +#: ../src/interface.c:335 msgid "New (with _Template)" msgstr "Nuevo (desde _plantilla)" -#: ../src/interface.c:351 ../src/interface.c:2332 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "Abrir archivo selecc_ionado" -#: ../src/interface.c:355 +#: ../src/interface.c:356 msgid "Recent _Files" msgstr "Arc_hivos recientes" -#: ../src/interface.c:372 +#: ../src/interface.c:373 msgid "Save A_ll" msgstr "Guardar _todos" -#: ../src/interface.c:388 +#: ../src/interface.c:389 msgid "R_eload As" msgstr "R_ecargar como" -#: ../src/interface.c:399 ../src/interface.c:634 ../src/interface.c:693 -#: ../src/interface.c:707 ../src/interface.c:1083 ../src/interface.c:1093 -#: ../src/interface.c:2297 ../src/interface.c:2311 +#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 +#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 +#: ../src/interface.c:2311 ../src/interface.c:2325 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:416 +#: ../src/interface.c:417 msgid "Page Set_up" msgstr "C_onfiguración de página" -#: ../src/interface.c:433 ../src/notebook.c:214 +#: ../src/interface.c:434 ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "Cerrar los _demás" -#: ../src/interface.c:441 ../src/notebook.c:219 +#: ../src/interface.c:442 ../src/notebook.c:262 msgid "C_lose All" msgstr "Cerrar _todos" -#: ../src/interface.c:458 ../src/interface.c:2231 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:508 +#: ../src/interface.c:509 msgid "_Commands" msgstr "_Comandos" -#: ../src/interface.c:515 ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "_Cortar líneas actuales" -#: ../src/interface.c:523 ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "_Copiar líneas actuales" -#: ../src/interface.c:531 ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "_Borrar líneas actuales" -#: ../src/interface.c:535 ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Duplicar línea o selección" -#: ../src/interface.c:544 ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "_Seleccionar líneas actuales" -#: ../src/interface.c:548 ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "_Seleccionar párrafo actual" -#: ../src/interface.c:557 ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "Enviar texto _seleccionado al terminal" -#: ../src/interface.c:561 ../src/interface.c:2235 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:568 ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Reestructurar líneas/bloque" -#: ../src/interface.c:572 ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "C_onvertir selección a mayús./minús." -#: ../src/interface.c:576 ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "_Transponer línea actual" -#: ../src/interface.c:585 +#: ../src/interface.c:586 msgid "_Comment Line(s)" msgstr "_Comentar línea(s)" -#: ../src/interface.c:589 +#: ../src/interface.c:590 msgid "U_ncomment Line(s)" msgstr "_Descomentar línea(s)" -#: ../src/interface.c:593 +#: ../src/interface.c:594 msgid "_Toggle Line Commentation" msgstr "Comen_tar/descomentar línea" -#: ../src/interface.c:602 +#: ../src/interface.c:603 msgid "_Increase Indent" msgstr "_Incrementar sangría" -#: ../src/interface.c:610 +#: ../src/interface.c:611 msgid "_Decrease Indent" msgstr "_Disminuir sangría" -#: ../src/interface.c:618 ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "_Sangría inteligente" -#: ../src/interface.c:627 +#: ../src/interface.c:628 msgid "_Send Selection to" msgstr "_Enviar texto seleccionado a" -#: ../src/interface.c:642 +#: ../src/interface.c:643 msgid "I_nsert Comments" msgstr "I_nsertar comentarios" -#: ../src/interface.c:653 ../src/interface.c:2246 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "Insertar entrada de _ChangeLog" -#: ../src/interface.c:657 ../src/interface.c:2250 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "Insertar descripción de _función" -#: ../src/interface.c:661 ../src/interface.c:2254 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "Insertar comentario _multilínea" -#: ../src/interface.c:670 ../src/interface.c:2269 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "Insertar _Cabecera de archivo" -#: ../src/interface.c:674 ../src/interface.c:2273 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "Insertar nota de licencia _GPL" -#: ../src/interface.c:678 ../src/interface.c:2277 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "Insertar nota de licencia _BSD" -#: ../src/interface.c:682 ../src/interface.c:2286 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "Insertar f_echa" -#: ../src/interface.c:696 ../src/interface.c:2300 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "_Insertar \"include <...>\"" -#: ../src/interface.c:715 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +msgid "_Insert Alternative White Space" +msgstr "_Insertar espacio en blanco alternativo" + +#: ../src/interface.c:720 msgid "Preference_s" msgstr "Preferencia_s" -#: ../src/interface.c:723 ../src/keybindings.c:386 +#: ../src/interface.c:728 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Preferencias de comp_lementos" -#: ../src/interface.c:731 ../src/interface.c:2323 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "_Buscar" -#: ../src/interface.c:742 +#: ../src/interface.c:747 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../src/interface.c:746 +#: ../src/interface.c:751 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../src/interface.c:755 +#: ../src/interface.c:760 msgid "Find in F_iles" msgstr "Buscar en arch_ivos" -#: ../src/interface.c:763 ../src/search.c:562 +#: ../src/interface.c:768 ../src/search.c:614 msgid "_Replace" msgstr "_Reemplazar" -#: ../src/interface.c:776 +#: ../src/interface.c:781 msgid "Next _Message" msgstr "Siguiente _mensaje" -#: ../src/interface.c:784 +#: ../src/interface.c:789 msgid "Pr_evious Message" msgstr "Mensaje ant_erior" -#: ../src/interface.c:797 ../src/keybindings.c:433 +#: ../src/interface.c:802 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "_Ir a la siguiente marca" -#: ../src/interface.c:801 ../src/keybindings.c:436 +#: ../src/interface.c:806 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "_Ir a la marca anterior" -#: ../src/interface.c:810 +#: ../src/interface.c:815 msgid "_Go to Line" msgstr "_Ir a la línea" -#: ../src/interface.c:818 ../src/interface.c:2258 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3531 msgid "_More" msgstr "_Más" -#: ../src/interface.c:825 ../src/keybindings.c:398 +#: ../src/interface.c:830 ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Buscar siguiente _selección" -#: ../src/interface.c:829 ../src/keybindings.c:400 +#: ../src/interface.c:834 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Buscar selección _anterior" -#: ../src/interface.c:838 ../src/interface.c:2340 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" msgstr "Encontrar _uso" -#: ../src/interface.c:842 ../src/interface.c:2348 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "Encontrar _uso del documento" -#: ../src/interface.c:851 ../src/keybindings.c:415 +#: ../src/interface.c:856 ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Marcar todo" -#: ../src/interface.c:860 ../src/interface.c:2356 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Ir a la definición de la eti_queta" -#: ../src/interface.c:864 +#: ../src/interface.c:869 msgid "Go to T_ag Declaration" msgstr "Ir a la declaración de la eti_queta" -#: ../src/interface.c:875 +#: ../src/interface.c:880 msgid "Change _Font" msgstr "Cambiar _fuente" -#: ../src/interface.c:888 +#: ../src/interface.c:893 msgid "To_ggle All Additional Widgets" msgstr "M_ostrar/ocultar todos los componentes adicionales" -#: ../src/interface.c:892 +#: ../src/interface.c:897 msgid "Full_screen" msgstr "Pantalla _completa" -#: ../src/interface.c:896 +#: ../src/interface.c:901 msgid "Show Message _Window" msgstr "Mostrar _ventana de mensajes" -#: ../src/interface.c:901 +#: ../src/interface.c:906 msgid "Show _Toolbar" msgstr "Mostrar barra de _herramientas" -#: ../src/interface.c:906 +#: ../src/interface.c:911 msgid "Show Side_bar" msgstr "Mostrar _barra lateral" -#: ../src/interface.c:911 ../src/interface.c:4247 ../src/interface.c:5576 +#: ../src/interface.c:916 ../src/interface.c:4302 ../src/interface.c:5637 #: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:918 +#: ../src/interface.c:923 msgid "Show _Markers Margin" msgstr "Mostrar margen de _marcas" -#: ../src/interface.c:923 +#: ../src/interface.c:928 msgid "Show _Line Numbers" msgstr "Mostrar números de _línea" -#: ../src/interface.c:928 +#: ../src/interface.c:933 msgid "Show _White Space" msgstr "Mostrar espacio en _blanco" -#: ../src/interface.c:932 +#: ../src/interface.c:937 msgid "Show Line _Endings" msgstr "Mostrar _fin de línea" -#: ../src/interface.c:936 +#: ../src/interface.c:941 msgid "Show _Indentation Guides" msgstr "Mostrar _guías de sangría" -#: ../src/interface.c:957 +#: ../src/interface.c:962 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:964 +#: ../src/interface.c:969 msgid "_Line Wrapping" msgstr "Ajuste de _línea" -#: ../src/interface.c:969 +#: ../src/interface.c:974 msgid "Line _Breaking" msgstr "_Salto de línea" -#: ../src/interface.c:973 +#: ../src/interface.c:978 msgid "_Auto-indentation" msgstr "Sangría _automática" -#: ../src/interface.c:978 +#: ../src/interface.c:983 msgid "In_dent Type" msgstr "Tipo de _sangría" -#: ../src/interface.c:985 ../src/interface.c:3855 ../src/interface.c:5474 +#: ../src/interface.c:990 ../src/interface.c:3894 ../src/interface.c:5535 msgid "_Tabs" msgstr "_Tabulaciones" -#: ../src/interface.c:991 ../src/interface.c:3846 ../src/interface.c:5465 +#: ../src/interface.c:996 ../src/interface.c:3885 ../src/interface.c:5526 msgid "_Spaces" msgstr "E_spacios" -#: ../src/interface.c:997 ../src/interface.c:3864 ../src/interface.c:5483 +#: ../src/interface.c:1002 msgid "T_abs and Spaces" msgstr "T_abulaciones y espacios" -#: ../src/interface.c:1003 +#: ../src/interface.c:1008 msgid "Indent Widt_h" msgstr "Anc_hura de sangría" -#: ../src/interface.c:1010 +#: ../src/interface.c:1015 msgid "_1" msgstr "_1" -#: ../src/interface.c:1016 +#: ../src/interface.c:1021 msgid "_2" msgstr "_2" -#: ../src/interface.c:1022 +#: ../src/interface.c:1027 msgid "_3" msgstr "_3" -#: ../src/interface.c:1028 +#: ../src/interface.c:1033 msgid "_4" msgstr "_4" -#: ../src/interface.c:1034 +#: ../src/interface.c:1039 msgid "_5" msgstr "_5" -#: ../src/interface.c:1040 +#: ../src/interface.c:1045 msgid "_6" msgstr "_6" -#: ../src/interface.c:1046 +#: ../src/interface.c:1051 msgid "_7" msgstr "_7" -#: ../src/interface.c:1052 +#: ../src/interface.c:1057 msgid "_8" msgstr "_8" -#: ../src/interface.c:1063 +#: ../src/interface.c:1068 msgid "Read _Only" msgstr "Sólo _lectura" -#: ../src/interface.c:1067 +#: ../src/interface.c:1072 msgid "_Write Unicode BOM" msgstr "Escribir _BOM Unicode" -#: ../src/interface.c:1076 +#: ../src/interface.c:1081 msgid "Set File_type" msgstr "Establecer _tipo de archivo" -#: ../src/interface.c:1086 +#: ../src/interface.c:1091 msgid "Set _Encoding" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5803] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5803 http://geany.svn.sourceforge.net/geany/?rev=5803&view=rev Author: statc Date: 2011-05-21 08:47:02 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5581..5600) Conflicts: src/keyfile.c Modified Paths: -------------- branches/sm/ChangeLog branches/sm/THANKS branches/sm/data/filetype_extensions.conf branches/sm/plugins/classbuilder.c branches/sm/plugins/export.c branches/sm/plugins/filebrowser.c branches/sm/po/ChangeLog branches/sm/po/de.po branches/sm/po/zh_TW.po branches/sm/src/about.c branches/sm/src/build.c branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/geany.h branches/sm/src/keyfile.c branches/sm/src/plugins.c branches/sm/src/symbols.c branches/sm/src/templates.c branches/sm/src/templates.h branches/sm/src/toolbar.c branches/sm/src/tools.c branches/sm/src/utils.c branches/sm/src/utils.h branches/sm/tagmanager/mio/mio-memory.c Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) @@ -1,3 +1,67 @@ +2011-03-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/filetypes.c: + Support copying filetype definition file group keys from a system + keyfile with e.g. [styling=C]. + Add function utils_make_filename() for building filenames easily. + * THANKS, plugins/classbuilder.c: + Improve Class Builder plugin dialog UI using a table (patch by + Matthew Brush, thanks). + * plugins/classbuilder.c: + Fix GLib warning when creating classes and no documents are open + (patch by Matthew Brush, thanks). + * plugins/classbuilder.c: + Undo patch change to cc_option_label_new() to append a ':' colon to + label text because this unnecessarily causes string translations to + be updated. + + +2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * THANKS, src/about.c: + Adding Wei-Lun Chao as current maintainer for traditional Chinese + translation. + + +2011-03-15 Colomban Wendling <colomban(at)geany(dot)org> + + * src/templates.c, src/templates.h: + Use the same indentation for all templates (part of FR#3193527; from + a patch by Matthew Brush, thanks). + * src/plugins.c: + Always keep the list of loaded plugin sorted by name. + + +2011-03-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetype_extensions.conf: + Add Markdown extension. + + +2011-03-10 Colomban Wendling <colomban(at)geany(dot)org> + + * src/toolbar.c: + Correctly expand the menubar if the toolbar is appended to it but + not visible (closes #3204955). + * plugins/filebrowser.c, src/editor.c, src/plugins.c, src/symbols.c, + src/tools.c, src/utils.c: + Prefer prepend elements to lists rather than append them, for better + performances. + + +2011-03-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/geany.h: + Fix wrong code example in the API docs + (spotted by Matthew Brush, thanks). + + +2011-03-07 Colomban Wendling <colomban(at)geany(dot)org> + + * tagmanager/mio/mio-memory.c: + Import upstream MIO changes not to require a C99 compiler. + + 2011-03-06 Colomban Wendling <colomban(at)geany(dot)org> * src/symbols.c: @@ -20,6 +84,7 @@ Add option to insert line numbers (closes #3197150). Cleanup. Use the full filename and add the extension of the export format. + Fix off-by-one bug which hidden the last empty line of a document. 2011-03-05 Colomban Wendling <colomban(at)geany(dot)org> Modified: branches/sm/THANKS =================================================================== --- branches/sm/THANKS 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/THANKS 2011-05-21 08:47:02 UTC (rev 5803) @@ -87,7 +87,7 @@ Mário Silva <sharelider(at)gmail(dot)com> - Lisp filetype Taylor Venable <taylor(at)metasyntax(dot)net> - Erlang filetype Manuel Bua <manuel(dot)bua(at)gmail(dot)com> - Ensure consistent line endings pref. -Matthew Brush <codebrainz(at)users(dot)sourceforge(dot)net> - Save As toolbar button. +Matthew Brush <codebrainz(at)users(dot)sourceforge(dot)net> - Various patches. Translators: ------------ @@ -145,6 +145,7 @@ Dormouse Young <mouselinux(at)163(dot)com> - zh_CN Xhacker Liu <liu.dongyuan(at)gmail(dot)com> - zh_CN KoViCH <kovich(dot)ian(at)gmail(dot)com> - zh_TW +Wei-Lun Chao <chaoweilun(at)gmail(dot)com> - zh_TW Projects: --------- Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:47:02 UTC (rev 5803) @@ -34,6 +34,7 @@ Lisp=*.lisp; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; +Markdown=*.mdml; Matlab/Octave=*.m; NSIS=*.nsi;*.nsh; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Modified: branches/sm/plugins/classbuilder.c =================================================================== --- branches/sm/plugins/classbuilder.c 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/plugins/classbuilder.c 2011-05-21 08:47:02 UTC (rev 5803) @@ -355,16 +355,88 @@ return NULL; } +/* Creates a new option label, indented on the left */ +GtkWidget *cc_option_label_new(const gchar *text) +{ + GtkWidget *align; + GtkWidget *label; + align = gtk_alignment_new(0.0, 0.5, 1.0, 1.0); + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0); + + label = gtk_label_new(text); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_container_add(GTK_CONTAINER(align), label); + + return align; +} + +/* Attaches a new section label at the specified table row, optionally + * padded at the top, and returns the new label. */ +GtkWidget *cc_table_attach_section_label(GtkWidget *table, + const gchar *text, + gint row, + gboolean top_padding) +{ + gchar *markup; + GtkWidget *label, *align; + + label = gtk_label_new(NULL); + markup = g_markup_printf_escaped("<b>%s</b>", text); + gtk_label_set_markup(GTK_LABEL(label), markup); + g_free(markup); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + + align = gtk_alignment_new(0.0, 0.5, 1.0, 1.0); + if (top_padding) + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 6, 0, 0, 0); + gtk_container_add(GTK_CONTAINER(align), label); + + gtk_table_attach(GTK_TABLE(table), align, + 0, 2, row, row+1, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + + return label; +} + +/* Attach a new option label at the specified table row and returns + * the label */ +GtkWidget *cc_table_attach_option_label(GtkWidget *table, + const gchar *text, + gint row) +{ + GtkWidget *opt_label = cc_option_label_new(text); + gtk_table_attach(GTK_TABLE(table), opt_label, + 0, 1, row, row+1, + GTK_FILL|GTK_SHRINK, GTK_FILL|GTK_SHRINK, 0, 0); + return opt_label; +} + +/* Attach an option label and entry to the table at the specified row. + * The label associated with the widget is set as data on the entry + * with the "label" key, if access to it is needed later. The entry + * widget is returned. */ +GtkWidget *cc_table_attach_option_entry(GtkWidget *table, + const gchar *text, + gint row) +{ + GtkWidget *label; + GtkWidget *entry; + label = cc_table_attach_option_label(table, text, row); + entry = gtk_entry_new(); + g_object_set_data(G_OBJECT(entry), "label", label); + gtk_table_attach(GTK_TABLE(table), entry, + 1, 2, row, row+1, + GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0); + return entry; +} + void show_dialog_create_class(gint type) { CreateClassDialog *cc_dlg; - GtkWidget *main_box; - GtkWidget *frame; - GtkWidget *align; - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; + GtkWidget *main_box, *table, *label, *hdr_hbox; + GtkWidget *opt_table, *align; + gint row; cc_dlg = g_new0(CreateClassDialog, 1); cc_dlg->class_type = type; @@ -375,175 +447,155 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_set_has_separator(GTK_DIALOG(cc_dlg->dialog), TRUE); + + switch (type) + { + case GEANY_CLASS_TYPE_CPP: + gtk_window_set_title(GTK_WINDOW(cc_dlg->dialog), _("Create C++ Class")); + break; + case GEANY_CLASS_TYPE_GTK: + gtk_window_set_title(GTK_WINDOW(cc_dlg->dialog), _("Create GTK+ Class")); + break; + case GEANY_CLASS_TYPE_PHP: + gtk_window_set_title(GTK_WINDOW(cc_dlg->dialog), _("Create PHP Class")); + break; + } + g_signal_connect_swapped(cc_dlg->dialog, "destroy", G_CALLBACK(g_free), (gpointer)cc_dlg); + table = gtk_table_new(13, 2, FALSE); + gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_table_set_row_spacings(GTK_TABLE(table), 6); + main_box = ui_dialog_vbox_new(GTK_DIALOG(cc_dlg->dialog)); + gtk_box_pack_start(GTK_BOX(main_box), table, TRUE, TRUE, 0); + row = 0; + if (type == GEANY_CLASS_TYPE_PHP || type == GEANY_CLASS_TYPE_GTK) { - frame = ui_frame_new_with_alignment(_("Namespace"), &align); - gtk_container_add(GTK_CONTAINER(main_box), frame); - - vbox = gtk_vbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(align), vbox); - - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - label = gtk_label_new(_("Namespace:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->class_namespace_entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), cc_dlg->class_namespace_entry, TRUE, TRUE, 0); + cc_table_attach_section_label(table, _("Namespace"), row++, FALSE); + cc_dlg->class_namespace_entry = cc_table_attach_option_entry(table, _("Name:"), row++); g_signal_connect(cc_dlg->class_namespace_entry, "changed", G_CALLBACK(cc_dlg_on_class_namespace_entry_changed), cc_dlg); } - frame = ui_frame_new_with_alignment(_("Class"), &align); - gtk_container_add(GTK_CONTAINER(main_box), frame); + if (type == GEANY_CLASS_TYPE_PHP || type == GEANY_CLASS_TYPE_GTK) + cc_table_attach_section_label(table, _("Class"), row++, TRUE); + else + cc_table_attach_section_label(table, _("Class"), row++, FALSE); - vbox = gtk_vbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(align), vbox); - - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - label = gtk_label_new(_("Class name:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->class_name_entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), cc_dlg->class_name_entry, TRUE, TRUE, 0); + cc_dlg->class_name_entry = cc_table_attach_option_entry(table, _("Name:"), row++); g_signal_connect(cc_dlg->class_name_entry, "changed", G_CALLBACK(cc_dlg_on_class_name_entry_changed), cc_dlg); if (type != GEANY_CLASS_TYPE_PHP) - { - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + cc_dlg->header_entry = cc_table_attach_option_entry(table, _("Header file:"), row++); - label = gtk_label_new(_("Header file:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + cc_dlg->source_entry = cc_table_attach_option_entry(table, _("Source file:"), row++); - cc_dlg->header_entry = gtk_entry_new(); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->header_entry); - } + cc_table_attach_section_label(table, _("Inheritance"), row++, TRUE); - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + cc_dlg->base_name_entry = cc_table_attach_option_entry(table, _("Base class:"), row++); - label = gtk_label_new(_("Source file:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->source_entry = gtk_entry_new(); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->source_entry); - - frame = ui_frame_new_with_alignment(_("Inheritance"), &align); - gtk_container_add(GTK_CONTAINER(main_box), frame); - - vbox = gtk_vbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(align), vbox); - - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - label = gtk_label_new(_("Base class:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->base_name_entry = gtk_entry_new(); if (type == GEANY_CLASS_TYPE_GTK) gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_name_entry), "GObject"); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_name_entry); g_signal_connect(cc_dlg->base_name_entry, "changed", G_CALLBACK(cc_dlg_on_base_name_entry_changed), (gpointer)cc_dlg); - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - if (type == GEANY_CLASS_TYPE_PHP) - label = gtk_label_new(_("Base source:")); + cc_dlg->base_header_entry = cc_table_attach_option_entry(table, _("Base source:"), row++); else - label = gtk_label_new(_("Base header:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + { + hdr_hbox = gtk_hbox_new(FALSE, 6); - cc_dlg->base_header_entry = gtk_entry_new(); - if (type == GEANY_CLASS_TYPE_GTK) - gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), "glib-object.h"); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_header_entry); + label = cc_table_attach_option_label(table, _("Base header:"), row); - if (type != GEANY_CLASS_TYPE_PHP) - { + cc_dlg->base_header_entry = gtk_entry_new(); + g_object_set_data(G_OBJECT(cc_dlg->base_header_entry), "label", label); + gtk_box_pack_start(GTK_BOX(hdr_hbox), + cc_dlg->base_header_entry, + TRUE, TRUE, 0); + cc_dlg->base_header_global_box = gtk_check_button_new_with_label(_("Global")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cc_dlg->base_header_global_box), TRUE); - gtk_box_pack_end(GTK_BOX(hbox), cc_dlg->base_header_global_box, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hdr_hbox), + cc_dlg->base_header_global_box, + FALSE, TRUE, 0); + + gtk_table_attach(GTK_TABLE(table), hdr_hbox, + 1, 2, row, row+1, + GTK_FILL | GTK_EXPAND, + GTK_FILL | GTK_EXPAND, + 0, 0); + row++; } if (type == GEANY_CLASS_TYPE_GTK) + gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), "glib-object.h"); + + if (type == GEANY_CLASS_TYPE_GTK) { - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - label = gtk_label_new(_("Base GType:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->base_gtype_entry = gtk_entry_new(); + cc_dlg->base_gtype_entry = cc_table_attach_option_entry(table, _("Base GType:"), row++); gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_gtype_entry), "G_TYPE_OBJECT"); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_gtype_entry); } if (type == GEANY_CLASS_TYPE_PHP) - { - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + cc_dlg->class_implements_entry = cc_table_attach_option_entry(table, _("Implements:"), row++); - label = gtk_label_new(_("Implements:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + cc_table_attach_section_label(table, _("Options"), row++, TRUE); - cc_dlg->class_implements_entry = gtk_entry_new(); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->class_implements_entry); - } + align = gtk_alignment_new(0.0, 0.5, 1.0, 1.0); + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0); - frame = ui_frame_new_with_alignment(_("Options"), &align); - gtk_container_add(GTK_CONTAINER(main_box), frame); + opt_table = gtk_table_new(1, 2, FALSE); + gtk_table_set_row_spacings(GTK_TABLE(opt_table), 6); + gtk_table_set_col_spacings(GTK_TABLE(opt_table), 6); + gtk_container_add(GTK_CONTAINER(align), opt_table); - vbox = gtk_vbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(align), vbox); + gtk_table_attach(GTK_TABLE(table), align, + 0, 2, row, row+1, + GTK_FILL|GTK_EXPAND, + GTK_FILL|GTK_EXPAND, + 0, 0); + row++; - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - cc_dlg->create_constructor_box = gtk_check_button_new_with_label(_("Create constructor")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box), TRUE); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_constructor_box); + gtk_table_attach(GTK_TABLE(opt_table), cc_dlg->create_constructor_box, + 0, 1, 0, 1, GTK_FILL|GTK_SHRINK, GTK_FILL|GTK_SHRINK, 0, 0); cc_dlg->create_destructor_box = gtk_check_button_new_with_label(_("Create destructor")); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_destructor_box); + gtk_table_attach(GTK_TABLE(opt_table), cc_dlg->create_destructor_box, + 1, 2, 0, 1, GTK_FILL|GTK_SHRINK, GTK_FILL|GTK_SHRINK, 0, 0); if (type == GEANY_CLASS_TYPE_PHP) { - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - + gtk_table_resize(GTK_TABLE(opt_table), 2, 2); cc_dlg->create_isabstract_box = gtk_check_button_new_with_label(_("Is abstract")); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_isabstract_box); - + gtk_table_attach(GTK_TABLE(opt_table), cc_dlg->create_isabstract_box, + 0, 1, 1, 2, GTK_FILL|GTK_SHRINK, GTK_FILL|GTK_SHRINK, 0, 0); cc_dlg->create_issingleton_box = gtk_check_button_new_with_label(_("Is singleton")); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_issingleton_box); + gtk_table_attach(GTK_TABLE(opt_table), cc_dlg->create_issingleton_box, + 1, 2, 1, 2, GTK_FILL|GTK_SHRINK, GTK_FILL|GTK_SHRINK, 0, 0); } + gtk_widget_show_all(align); + if (type == GEANY_CLASS_TYPE_GTK) { - hbox = gtk_hbox_new(FALSE, 10); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + cc_dlg->gtk_constructor_type_entry = cc_table_attach_option_entry(table, + _("Constructor type:"), row++); + gtk_entry_set_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry), "GObject"); g_signal_connect(cc_dlg->create_constructor_box, "toggled", - G_CALLBACK(cc_dlg_on_set_sensitive_toggled), (gpointer)hbox); - - label = gtk_label_new(_("GTK+ constructor type")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - cc_dlg->gtk_constructor_type_entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry), "GObject"); - gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->gtk_constructor_type_entry); + G_CALLBACK(cc_dlg_on_set_sensitive_toggled), + cc_dlg->gtk_constructor_type_entry); } + else if (type == GEANY_CLASS_TYPE_PHP) + gtk_table_resize(GTK_TABLE(table), row, 2); + else if (type == GEANY_CLASS_TYPE_CPP) + gtk_table_resize(GTK_TABLE(table), row, 2); gtk_widget_show_all(cc_dlg->dialog); while (gtk_dialog_run(GTK_DIALOG(cc_dlg->dialog)) == GTK_RESPONSE_OK) @@ -559,13 +611,19 @@ static void cc_dlg_on_set_sensitive_toggled(GtkWidget *toggle_button, GtkWidget *target_widget) { + GtkWidget *label; + g_return_if_fail(toggle_button != NULL); g_return_if_fail(GTK_IS_TOGGLE_BUTTON(toggle_button)); g_return_if_fail(target_widget != NULL); g_return_if_fail(GTK_IS_WIDGET(target_widget)); + label = g_object_get_data(G_OBJECT(target_widget), "label"); + gtk_widget_set_sensitive(target_widget, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle_button))); + gtk_widget_set_sensitive(label, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle_button))); } @@ -978,16 +1036,16 @@ /* only create the files if the filename is not empty */ if (! utils_str_equal(class_info->source, "")) { + doc = document_new_file(class_info->source, NULL, NULL); text = get_template_class_source(class_info); - doc = document_new_file(class_info->source, NULL, NULL); editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE); g_free(text); } if (! utils_str_equal(class_info->header, "") && class_info->type != GEANY_CLASS_TYPE_PHP) { + doc = document_new_file(class_info->header, NULL, NULL); text = get_template_class_header(class_info); - doc = document_new_file(class_info->header, NULL, NULL); editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE); g_free(text); } Modified: branches/sm/plugins/export.c =================================================================== --- branches/sm/plugins/export.c 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/plugins/export.c 2011-05-21 08:47:02 UTC (rev 5803) @@ -392,7 +392,7 @@ /* read the document and write the LaTeX code */ body = g_string_new(""); doc_len = sci_get_length(sci); - for (i = 0; i < doc_len; i++) + for (i = 0; i <= doc_len; i++) { style = sci_get_style_at(sci, i); c = sci_get_char_at(sci, i); @@ -421,9 +421,11 @@ g_string_append(body, "}\n"); block_open = FALSE; } - g_string_append_printf(body, "\\style%s{", get_tex_style(style)); - - block_open = TRUE; + if (i < doc_len) + { + g_string_append_printf(body, "\\style%s{", get_tex_style(style)); + block_open = TRUE; + } } /* escape the current character if necessary else just add it */ switch (c) @@ -632,7 +634,7 @@ /* read the document and write the HTML body */ body = g_string_new(""); doc_len = sci_get_length(sci); - for (i = 0; i < doc_len; i++) + for (i = 0; i <= doc_len; i++) { style = sci_get_style_at(sci, i); c = sci_get_char_at(sci, i); @@ -661,9 +663,11 @@ { g_string_append(body, "</span>"); } - g_string_append_printf(body, "<span class=\"style_%d\">", style); - - span_open = TRUE; + if (i < doc_len) + { + g_string_append_printf(body, "<span class=\"style_%d\">", style); + span_open = TRUE; + } } /* escape the current character if necessary else just add it */ switch (c) Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:47:02 UTC (rev 5803) @@ -492,8 +492,9 @@ GtkTreePath *treepath = item->data; gchar *fname = get_tree_path_filename(treepath); - files = g_slist_append(files, fname); + files = g_slist_prepend(files, fname); } + files = g_slist_reverse(files); document_open_files(files, FALSE, NULL, NULL); doc = document_get_current(); if (doc != NULL && ! do_not_focus) Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/po/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) @@ -1,6 +1,23 @@ +2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * zh_TW.po: Update of traditional Chinese translation. + Thanks to Wei-Lun Chao for providing update. + + +2011-03-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * zh_TW.po: Update of traditional Chinese translation. + Thanks to Wei-Lun Chao for providing update. + + +2011-03-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation. + + 2011-01-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * vi.po: Update of Vietnamese translation. Thanks to Nguyễn Hồng Quân. + * vi.po: Update of Vietnamese translation. Thanks to Nguyễn Hồng Quân. 2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: branches/sm/po/de.po =================================================================== --- branches/sm/po/de.po 2011-05-21 08:45:34 UTC (rev 5802) +++ branches/sm/po/de.po 2011-05-21 08:47:02 UTC (rev 5803) @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 16:52+0100\n" -"PO-Revision-Date: 2010-12-26 22:17+0100\n" -"Last-Translator: Dominic Hopf <dmaphy(a)googlemail.com>\n" +"POT-Creation-Date: 2011-03-06 20:08+0100\n" +"PO-Revision-Date: 2011-03-06 20:14+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -28,7 +28,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:310 +#: ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -36,75 +38,69 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:152 +#: ../src/about.c:154 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:202 +#: ../src/about.c:204 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:223 +#: ../src/about.c:225 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:254 +#: ../src/about.c:256 msgid "Info" msgstr "Info" -#: ../src/about.c:270 +#: ../src/about.c:272 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:279 +#: ../src/about.c:281 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:287 +#: ../src/about.c:289 +#: ../src/about.c:297 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:295 +#: ../src/about.c:305 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:304 +#: ../src/about.c:314 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:324 +#: ../src/about.c:334 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:345 +#: ../src/about.c:355 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:355 +#: ../src/about.c:365 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " -"detailliertere Liste findet sich in der Datei %s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:381 +#: ../src/about.c:391 msgid "Credits" msgstr "Credits" -#: ../src/about.c:395 +#: ../src/about.c:405 msgid "License" msgstr "Lizenz" -#: ../src/about.c:404 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." -"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." +#: ../src/about.c:414 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #. fall back to %d #: ../src/build.c:655 @@ -121,7 +117,9 @@ msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1486 +#: ../src/build.c:739 +#: ../src/build.c:961 +#: ../src/search.c:1524 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -137,20 +135,13 @@ msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" #: ../src/build.c:890 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " -"Befehl auf der Kommandozeile." +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile." #: ../src/build.c:928 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " -"den Einstellungen überprüfen)" +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" #: ../src/build.c:1101 msgid "Compilation failed." @@ -166,9 +157,7 @@ #: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "" -"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " -"wird." +msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird." #: ../src/build.c:1353 msgid "_Next Error" @@ -182,7 +171,8 @@ msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1649 ../src/toolbar.c:373 +#: ../src/build.c:1649 +#: ../src/toolbar.c:374 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" @@ -203,7 +193,8 @@ msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1711 ../src/build.c:1723 +#: ../src/build.c:1711 +#: ../src/build.c:1723 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -212,11 +203,13 @@ msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1845 ../src/symbols.c:650 +#: ../src/build.c:1845 +#: ../src/symbols.c:737 msgid "Label" msgstr "Label" -#: ../src/build.c:1846 ../src/symbols.c:645 +#: ../src/build.c:1846 +#: ../src/symbols.c:732 msgid "Command" msgstr "Kommando" @@ -232,7 +225,8 @@ msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:1975 ../src/build.c:1977 +#: ../src/build.c:1975 +#: ../src/build.c:1977 #, c-format msgid "%s Commands" msgstr "Kommandos für %s" @@ -241,7 +235,8 @@ msgid "No Filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1985 ../src/build.c:2020 +#: ../src/build.c:1985 +#: ../src/build.c:2020 msgid "Error Regular Expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" @@ -251,9 +246,7 @@ #: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." -msgstr "" -"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " -"Kommandos an" +msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an" #: ../src/build.c:2054 msgid "Execute Commands" @@ -261,12 +254,8 @@ #: ../src/build.c:2066 #, c-format -msgid "" -"%d, %e, %f, %p are substituted in command and directory fields, see manual " -"for details." -msgstr "" -"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " -"- Details gibt es in der Dokumentation." +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." #: ../src/build.c:2226 msgid "Set Build Commands" @@ -277,25 +266,34 @@ msgstr "_Kompilieren" #. build the code -#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 +#: ../src/build.c:2444 +#: ../src/build.c:2706 +#: ../src/interface.c:1223 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 +#: ../src/build.c:2451 +#: ../src/build.c:2481 +#: ../src/build.c:2674 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 +#: ../src/build.c:2496 +#: ../src/build.c:2672 +#: ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 +#: ../src/build.c:2498 +#: ../src/build.c:2673 +#: ../src/build.c:2734 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2500 ../src/build.c:2671 +#: ../src/build.c:2500 +#: ../src/build.c:2671 msgid "_Make" msgstr "_Make" @@ -320,8 +318,10 @@ msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:490 ../src/document.c:2999 ../src/interface.c:381 -#: ../src/sidebar.c:683 +#: ../src/callbacks.c:490 +#: ../src/document.c:2999 +#: ../src/interface.c:381 +#: ../src/sidebar.c:695 msgid "_Reload" msgstr "_Neu laden" @@ -334,7 +334,8 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:425 +#: ../src/callbacks.c:1196 +#: ../src/keybindings.c:425 msgid "Go to Line" msgstr "Gehe zu Zeile" @@ -342,36 +343,43 @@ msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1291 ../src/callbacks.c:1316 -msgid "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1291 +#: ../src/callbacks.c:1316 +msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1424 ../src/ui_utils.c:619 +#: ../src/callbacks.c:1424 +#: ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1426 ../src/ui_utils.c:620 +#: ../src/callbacks.c:1426 +#: ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1428 ../src/ui_utils.c:621 +#: ../src/callbacks.c:1428 +#: ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1430 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1430 +#: ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1432 ../src/ui_utils.c:631 +#: ../src/callbacks.c:1432 +#: ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1434 ../src/ui_utils.c:632 +#: ../src/callbacks.c:1434 +#: ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1436 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1436 +#: ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" @@ -380,23 +388,21 @@ msgstr "Benutzerdefiniertes Datumsformat" #: ../src/callbacks.c:1441 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " -"funktionieren alle Platzhalter der ANSI C Funktion »strftime«." +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei funktionieren alle Platzhalter der ANSI C Funktion »strftime«." #: ../src/callbacks.c:1462 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1688 ../src/callbacks.c:1698 +#: ../src/callbacks.c:1688 +#: ../src/callbacks.c:1698 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#: ../src/dialogs.c:178 ../src/interface.c:3909 ../src/interface.c:5532 +#: ../src/dialogs.c:178 +#: ../src/interface.c:3912 +#: ../src/interface.c:5553 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -420,27 +426,31 @@ msgid "Middle Eastern" msgstr "Nahöstlich" -#: ../src/dialogs.c:191 ../src/encodings.c:120 ../src/encodings.c:121 -#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124 -#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127 +#: ../src/dialogs.c:191 +#: ../src/encodings.c:120 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 msgid "Unicode" msgstr "Unicode" -#: ../src/dialogs.c:239 ../src/dialogs.c:324 +#: ../src/dialogs.c:239 +#: ../src/dialogs.c:324 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:243 ../src/interface.c:873 +#: ../src/dialogs.c:243 +#: ../src/interface.c:873 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:246 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle " -"schreibgeschützt geöffnet." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle schreibgeschützt geöffnet." #: ../src/dialogs.c:268 msgid "Detect by file extension" @@ -461,16 +471,11 @@ #: ../src/dialogs.c:384 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " -"automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " -"gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo #: ../src/dialogs.c:391 @@ -479,15 +484,11 @@ #: ../src/dialogs.c:401 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " -"Dateiendung erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem " -"gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." #: ../src/dialogs.c:480 msgid "Overwrite?" @@ -497,7 +498,8 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:513 ../src/dialogs.c:642 +#: ../src/dialogs.c:513 +#: ../src/dialogs.c:642 msgid "Save File" msgstr "Datei speichern" @@ -514,27 +516,28 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:533 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " -"neuen Reiter." +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." -#: ../src/dialogs.c:660 ../src/win32.c:681 +#: ../src/dialogs.c:660 +#: ../src/win32.c:681 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:663 ../src/dialogs.c:1543 ../src/win32.c:687 +#: ../src/dialogs.c:663 +#: ../src/dialogs.c:1543 +#: ../src/win32.c:687 #: ../src/win32.c:746 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:666 ../src/win32.c:693 +#: ../src/dialogs.c:666 +#: ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:669 ../src/win32.c:699 +#: ../src/dialogs.c:669 +#: ../src/win32.c:699 msgid "Information" msgstr "Information" @@ -556,21 +559,24 @@ msgstr "Schriftart auswählen" #: ../src/dialogs.c:1157 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " -"werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 -#: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 -#: ../src/symbols.c:1751 ../src/symbols.c:1772 ../src/symbols.c:1824 +#: ../src/dialogs.c:1176 +#: ../src/dialogs.c:1177 +#: ../src/dialogs.c:1178 +#: ../src/dialogs.c:1184 +#: ../src/dialogs.c:1185 +#: ../src/dialogs.c:1186 +#: ../src/symbols.c:1980 +#: ../src/symbols.c:2001 +#: ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1191 ../src/symbols.c:800 +#: ../src/dialogs.c:1191 +#: ../src/symbols.c:887 msgid "Properties" msgstr "Eigenschaften" @@ -598,7 +604,8 @@ msgid "<b>Encoding:</b>" msgstr "<b>Kodierung:</b>" -#: ../src/dialogs.c:1290 ../src/ui_utils.c:248 +#: ../src/dialogs.c:1290 +#: ../src/ui_utils.c:248 msgid "(with BOM)" msgstr "(mit BOM)" @@ -660,7 +667,8 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:967 ../src/document.c:1485 +#: ../src/document.c:967 +#: ../src/document.c:1485 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." @@ -668,14 +676,10 @@ #: ../src/document.c:997 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " -"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " -"enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." #. For translators: the second wildcard is an encoding name, e.g. @@ -687,12 +691,8 @@ #: ../src/document.c:1033 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " -"wird nicht unterstützt." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." #: ../src/document.c:1184 msgid "Spaces" @@ -713,7 +713,8 @@ msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1248 ../src/document.c:1858 +#: ../src/document.c:1248 +#: ../src/document.c:1858 msgid "Invalid filename" msgstr "Ungültiger Dateiname" @@ -740,12 +741,8 @@ #: ../src/document.c:1666 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " -"Die Datei wird <i>nicht</i> gespeichert." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird <i>nicht</i> gespeichert." #: ../src/document.c:1688 #, c-format @@ -764,22 +761,20 @@ #: ../src/document.c:1743 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" #: ../src/document.c:1761 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" #: ../src/document.c:1775 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1858 ../src/document.c:1923 +#: ../src/document.c:1858 +#: ../src/document.c:1923 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." @@ -804,7 +799,9 @@ msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:2022 ../src/document.c:2079 ../src/document.c:2087 +#: ../src/document.c:2022 +#: ../src/document.c:2079 +#: ../src/document.c:2087 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." @@ -813,13 +810,17 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2166 ../src/search.c:1146 ../src/search.c:1190 -#: ../src/search.c:1882 ../src/search.c:1883 +#: ../src/document.c:2166 +#: ../src/search.c:1185 +#: ../src/search.c:1229 +#: ../src/search.c:1920 +#: ../src/search.c:1921 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2177 ../src/document.c:2186 +#: ../src/document.c:2177 +#: ../src/document.c:2186 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -835,9 +836,7 @@ msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "" -"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " -"Version." +msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." #: ../src/document.c:3019 msgid "Close _without saving" @@ -852,17 +851,15 @@ msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4326 +#: ../src/editor.c:4362 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4327 +#: ../src/editor.c:4363 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" -"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " -"werden sollen." +msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." -#: ../src/editor.c:4477 +#: ../src/editor.c:4513 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -871,7 +868,8 @@ msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:76 ../src/encodings.c:77 +#: ../src/encodings.c:76 +#: ../src/encodings.c:77 msgid "Greek" msgstr "Griechisch" @@ -883,22 +881,31 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 +#: ../src/encodings.c:80 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 #: ../src/encodings.c:83 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87 +#: ../src/encodings.c:85 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90 +#: ../src/encodings.c:88 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94 -#: ../src/encodings.c:95 ../src/encodings.c:96 +#: ../src/encodings.c:91 +#: ../src/encodings.c:92 +#: ../src/encodings.c:94 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 msgid "Cyrillic" msgstr "Kyrillisch" @@ -914,12 +921,16 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 +#: ../src/encodings.c:101 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107 +#: ../src/encodings.c:104 +#: ../src/encodings.c:106 +#: ../src/encodings.c:107 msgid "Hebrew" msgstr "Hebräisch" @@ -939,30 +950,42 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115 +#: ../src/encodings.c:113 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118 +#: ../src/encodings.c:116 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 msgid "Vietnamese" msgstr "Vietnamesisch" #. maybe not available on Linux -#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131 +#: ../src/encodings.c:129 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 #: ../src/encodings.c:133 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136 +#: ../src/encodings.c:134 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139 +#: ../src/encodings.c:137 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 #: ../src/encodings.c:140 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143 +#: ../src/encodings.c:141 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 #: ../src/encodings.c:144 msgid "Korean" msgstr "Koreanisch" @@ -995,8 +1018,11 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:80 ../src/filetypes.c:162 ../src/filetypes.c:176 -#: ../src/filetypes.c:184 ../src/filetypes.c:198 +#: ../src/filetypes.c:80 +#: ../src/filetypes.c:162 +#: ../src/filetypes.c:176 +#: ../src/filetypes.c:184 +#: ../src/filetypes.c:198 #, c-format msgid "%s source file" msgstr "%s Quelldatei" @@ -1006,8 +1032,10 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3852 -#: ../src/interface.c:5475 +#: ../src/filetypes.c:99 +#: ../src/filetypes.c:1560 +#: ../src/interface.c:3855 +#: ../src/interface.c:5496 msgid "None" msgstr "Keiner" @@ -1031,50 +1059,54 @@ msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:398 +#: ../src/filetypes.c:405 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:404 +#: ../src/filetypes.c:411 msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:427 +#: ../src/filetypes.c:434 #, c-format msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:661 +#: ../src/filetypes.c:668 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:662 +#: ../src/filetypes.c:669 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:663 +#: ../src/filetypes.c:670 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:664 +#: ../src/filetypes.c:671 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:665 +#: ../src/filetypes.c:672 msgid "_Custom Filetypes" msgstr "_Benutzerdefinierte Dateitypen" -#: ../src/filetypes.c:1281 ../src/win32.c:105 +#: ../src/filetypes.c:1288 +#: ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1306 ../src/project.c:288 ../src/win32.c:95 -#: ../src/win32.c:143 ../src/win32.c:145 +#: ../src/filetypes.c:1313 +#: ../src/project.c:293 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1364 +#: ../src/filetypes.c:1371 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1083,17 +1115,19 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3595 ../src/main.c:815 ../src/socket.c:165 +#: ../src/highlighting.c:3621 +#: ../src/main.c:815 +#: ../src/socket.c:165 #: ../src/templates.c:315 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." -#: ../src/highlighting.c:3615 +#: ../src/highlighting.c:3641 msgid "_Default" msgstr "_Standard" -#: ../src/highlighting.c:3656 +#: ../src/highlighting.c:3682 msgid "_Color Schemes" msgstr "_Farbschemata" @@ -1105,7 +1139,8 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:352 ../src/interface.c:2346 +#: ../src/interface.c:352 +#: ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1121,9 +1156,14 @@ msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 -#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 -#: ../src/interface.c:2311 ../src/interface.c:2325 +#: ../src/interface.c:400 +#: ../src/interface.c:635 +#: ../src/interface.c:694 +#: ../src/interface.c:708 +#: ../src/interface.c:1088 +#: ../src/interface.c:1098 +#: ../src/interface.c:2311 +#: ../src/interface.c:2325 msgid "invisible" msgstr "unsichtbar" @@ -1131,15 +1171,18 @@ msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:434 ../src/notebook.c:214 +#: ../src/interface.c:434 +#: ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:442 ../src/notebook.c:219 +#: ../src/interface.c:442 +#: ../src/notebook.c:262 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:459 ../src/interface.c:2241 +#: ../src/interface.c:459 +#: ../src/interface.c:2241 msgid "_Edit" msgstr "_Bearbeiten" @@ -1147,47 +1190,58 @@ msgid "_Commands" msgstr "_Kommandos" -#: ../src/interface.c:516 ../src/keybindings.c:311 +#: ../src/interface.c:516 +#: ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../src/interface.c:524 ../src/keybindings.c:308 +#: ../src/interface.c:524 +#: ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../src/interface.c:532 ../src/keybindings.c:263 +#: ../src/interface.c:532 +#: ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../src/interface.c:536 ../src/keybindings.c:260 +#: ../src/interface.c:536 +#: ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:545 ../src/keybindings.c:321 +#: ../src/interface.c:545 +#: ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../src/interface.c:549 ../src/keybindings.c:324 +#: ../src/interface.c:549 +#: ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../src/interface.c:558 ../src/keybindings.c:363 +#: ../src/interface.c:558 +#: ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:562 ../src/interface.c:2245 +#: ../src/interface.c:562 +#: ../src/interface.c:2245 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:569 ../src/keybindings.c:365 +#: ../src/interface.c:569 +#: ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../src/interface.c:573 ../src/keybindings.c:335 +#: ../src/interface.c:573 +#: ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:577 ../src/keybindings.c:270 +#: ../src/interface.c:577 +#: ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" @@ -1211,7 +1265,8 @@ msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:619 ../src/keybindings.c:354 +#: ../src/interface.c:619 +#: ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1223,39 +1278,49 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:654 ../src/interface.c:2260 +#: ../src/interface.c:654 +#: ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:658 ../src/interface.c:2264 +#: ../src/interface.c:658 +#: ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:662 ../src/interface.c:2268 +#: ../src/interface.c:662 +#: ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:671 ../src/interface.c:2283 +#: ../src/interface.c:671 +#: ../src/interface.c:2283 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:675 ../src/interface.c:2287 +#: ../src/interface.c:675 +#: ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:679 ../src/interface.c:2291 +#: ../src/interface.c:679 +#: ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:683 ../src/interface.c:2300 +#: ../src/interface.c:683 +#: ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:697 ../src/interface.c:2314 +#: ../src/interface.c:697 +#: ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +#: ../src/interface.c:711 +#: ../src/interface.c:2333 +#: ../src/keybindings.c:374 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -1263,11 +1328,13 @@ msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:728 ../src/keybindings.c:387 +#: ../src/interface.c:728 +#: ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../src/interface.c:736 ../src/interface.c:2337 +#: ../src/interface.c:736 +#: ../src/interface.c:2337 msgid "_Search" msgstr "_Suchen" @@ -1283,7 +1350,8 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:768 ../src/search.c:562 +#: ../src/interface.c:768 +#: ../src/search.c:614 msgid "_Replace" msgstr "_Ersetzen" @@ -1295,11 +1363,13 @@ msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:802 ../src/keybindings.c:434 +#: ../src/interface.c:802 +#: ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../src/interface.c:806 ../src/keybindings.c:437 +#: ../src/interface.c:806 +#: ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1307,31 +1377,39 @@ msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3528 +#: ../src/interface.c:823 +#: ../src/interface.c:2272 +#: ../src/interface.c:3531 msgid "_More" msgstr "_Weitere" -#: ../src/interface.c:830 ../src/keybindings.c:399 +#: ../src/interface.c:830 +#: ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../src/interface.c:834 ../src/keybindings.c:401 +#: ../src/interface.c:834 +#: ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../src/interface.c:843 ../src/interface.c:2354 +#: ../src/interface.c:843 +#: ../src/interface.c:2354 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:847 ../src/interface.c:2362 +#: ../src/interface.c:847 +#: ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:856 ../src/keybindings.c:416 +#: ../src/interface.c:856 +#: ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Alles markieren" -#: ../src/interface.c:865 ../src/interface.c:2370 +#: ../src/interface.c:865 +#: ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" @@ -1363,8 +1441,11 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:916 ../src/interface.c:4283 ../src/interface.c:5616 -#: ../src/keybindings.c:253 ../src/prefs.c:1557 +#: ../src/interface.c:916 +#: ../src/interface.c:4302 +#: ../src/interface.c:5637 +#: ../src/keybindings.c:253 +#: ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" @@ -1408,15 +1489,21 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:990 ../src/interface.c:3891 ../src/interface.c:5514 +#: ../src/interface.c:990 +#: ../src/interface.c:3894 +#: ../src/interface.c:5535 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:996 ../src/interface.c:3882 ../src/interface.c:5505 +#: ../src/interface.c:996 +#: ../src/interface.c:3885 +#: ../src/interface.c:5526 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:1002 ../src/interface.c:3900 ../src/interface.c:5523 +#: ../src/interface.c:1002 +#: ../src/interface.c:3903 +#: ../src/interface.c:5544 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" @@ -1568,7 +1655,8 @@ msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1271 ../src/interface.c:1278 +#: ../src/interface.c:1271 +#: ../src/interface.c:1278 msgid "_Help" msgstr "_Hilfe" @@ -1584,7 +1672,8 @@ msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1333 ../src/sidebar.c:132 +#: ../src/interface.c:1333 +#: ../src/sidebar.c:132 msgid "Symbols" msgstr "Symbole" @@ -1624,236 +1713,178 @@ msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2904 ../src/keybindings.c:384 +#: ../src/interface.c:2907 +#: ../src/keybindings.c:384 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2940 +#: ../src/interface.c:2943 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2943 +#: ../src/interface.c:2946 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2945 +#: ../src/interface.c:2948 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2947 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " -"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " -"deaktiviert werden." +#: ../src/interface.c:2950 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden." -#: ../src/interface.c:2949 +#: ../src/interface.c:2952 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2953 +#: ../src/interface.c:2956 msgid "<b>Startup</b>" msgstr "<b>Starten</b>" -#: ../src/interface.c:2972 +#: ../src/interface.c:2975 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2975 +#: ../src/interface.c:2978 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" -"Speichert die Fensterposition und die Fenstergröße und stellt sie beim " -"nächsten Start wieder her." +msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her." -#: ../src/interface.c:2977 +#: ../src/interface.c:2980 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2980 +#: ../src/interface.c:2983 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2982 +#: ../src/interface.c:2985 msgid "<b>Shutdown</b>" msgstr "<b>Beenden </b>" -#: ../src/interface.c:3003 +#: ../src/interface.c:3006 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3015 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " -"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " -"Sie das Feld leer." +#: ../src/interface.c:3018 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." -#: ../src/interface.c:3028 +#: ../src/interface.c:3031 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3043 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:3053 +#: ../src/interface.c:3056 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:3065 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Geany schaut standardmäßig im Installationsverzeichnis und im " -"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " -"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " -"ignoriert, falls es leer ist." +#: ../src/interface.c:3068 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." -#: ../src/interface.c:3078 +#: ../src/interface.c:3081 msgid "<b>Paths</b>" msgstr "<b>Pfade</b>" -#: ../src/interface.c:3083 +#: ../src/interface.c:3086 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:3106 +#: ../src/interface.c:3109 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:3109 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll" +#: ../src/interface.c:3112 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" -#: ../src/interface.c:3111 +#: ../src/interface.c:3114 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:3114 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " -"wenn eine neue Statusmeldung vorliegt" +#: ../src/interface.c:3117 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:3116 +#: ../src/interface.c:3119 msgid "Suppress status messages in the status bar" msgstr "Meldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3119 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " -"weiterhin über den »Status«-Reiter im Infobereich abrufbar." +#: ../src/interface.c:3122 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:3121 +#: ../src/interface.c:3124 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3124 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " -"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " -"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " -"Werkzeugliste sowie für das integrierte Terminal." +#: ../src/interface.c:3127 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:3126 +#: ../src/interface.c:3129 msgid "Use Windows File Open/Save dialogs" msgstr "Benutze den Windows Datei öffnen/speichern Dialog" -#: ../src/interface.c:3129 -msgid "" -"Defines whether to use the native Windows File Open/Save dialogs or whether " -"to use the GTK default dialogs" -msgstr "" -"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" -"Dialogs genutzt werden soll." +#: ../src/interface.c:3132 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll." -#: ../src/interface.c:3131 ../src/interface.c:3367 ../src/interface.c:4493 +#: ../src/interface.c:3134 +#: ../src/interface.c:3370 +#: ../src/interface.c:4512 msgid "<b>Miscellaneous</b>" msgstr "<b>Sonstiges</b>" -#: ../src/interface.c:3150 +#: ../src/interface.c:3153 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:3153 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " -"Klicken auf Nächstes/Vorheriges schließen" +#: ../src/interface.c:3156 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:3155 +#: ../src/interface.c:3158 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:3158 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" +#: ../src/interface.c:3161 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" -#: ../src/interface.c:3160 +#: ../src/interface.c:3163 msgid "Use the current file's directory for Find in Files" msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen" -#: ../src/interface.c:3164 +#: ../src/interface.c:3167 msgid "<b>Search</b>" msgstr "<b>Suche</b>" -#: ../src/interface.c:3183 +#: ../src/interface.c:3186 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:3186 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " -"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" +#: ../src/interface.c:3189 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" -#: ../src/interface.c:3188 +#: ../src/interface.c:3191 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:3191 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " -"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " -"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " -"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +#: ../src/interface.c:3194 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:3193 +#: ../src/interface.c:3196 msgid "<b>Projects</b>" msgstr "<b>Projekte</b>" -#: ../src/interface.c:3198 +#: ../src/interface.c:3201 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1861,1086 +1892,973 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3202 ../src/prefs.c:1551 +#: ../src/interface.c:3205 +#: ../src/prefs.c:1551 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3243 +#: ../src/interface.c:3246 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:3246 +#: ../src/interface.c:3249 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:3248 +#: ../src/interface.c:3251 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3251 +#: ../src/interface.c:3254 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:3253 +#: ../src/interface.c:3256 msgid "Show sidebar" msgstr "Seitenleiste anzeigen" -#: ../src/interface.c:3261 +#: ../src/interface.c:3264 msgid "Position:" msgstr "Position:" -#: ../src/interface.c:3265 ../src/interface.c:3421 ../src/interface.c:3482 -#: ../src/interface.c:3500 ../src/interface.c:3518 +#: ../src/interface.c:3268 +#: ../src/interface.c:3424 +#: ../src/interface.c:3485 +#: ../src/interface.c:3503 +#: ../src/interface.c:3521 msgid "Left" msgstr "Links" -#: ../src/interface.c:3272 ../src/interface.c:3429 ../src/interface.c:3483 -#: ../src/interface.c:3501 ../src/interface.c:3519 +#: ../src/interface.c:3275 +#: ../src/interface.c:3432 +#: ../src/interface.c:3486 +#: ../src/interface.c:3504 +#: ../src/interface.c:3522 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3278 +#: ../src/interface.c:3281 msgid "<b>Sidebar</b>" msgstr "<b>Seitenleiste</b>" -#: ../src/interface.c:3299 +#: ../src/interface.c:3302 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3306 ../src/interface.c:3469 +#: ../src/interface.c:3309 +#: ../src/interface.c:3472 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3313 ../src/interface.c:3505 +#: ../src/interface.c:3316 +#: ../src/interface.c:3508 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3325 +#: ../src/interface.c:3328 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3333 +#: ../src/interface.c:3336 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3341 +#: ../src/interface.c:3344 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3343 +#: ../src/interface.c:3346 msgid "<b>Fonts</b>" msgstr "<b>Schriftarten</b>" -#: ../src/interface.c:3362 +#: ../src/interface.c:3365 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3365 +#: ../src/interface.c:3368 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" -"Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " -"werden soll oder nicht" +msgstr "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt werden soll oder nicht" -#: ../src/interface.c:3372 ../src/interface.c:3532 ../src/prefs.c:1553 +#: ../src/interface.c:3375 +#: ../src/interface.c:3535 +#: ../src/prefs.c:1553 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3395 +#: ../src/interface.c:3398 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3399 +#: ../src/interface.c:3402 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3402 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer " -"Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" +#: ../src/interface.c:3405 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3408 +#: ../src/interface.c:3411 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3424 +#: ../src/interface.c:3427 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3432 +#: ../src/interface.c:3435 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3436 +#: ../src/interface.c:3439 msgid "Next to current" msgstr "Reiter neben aktuellem öffnen" -#: ../src/interface.c:3441 -msgid "" -"Whether to place file tabs next to the current tab rather than at the edges " -"of the notebook" -msgstr "" -"Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der " -"Liste eingefügt werden." +#: ../src/interface.c:3444 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der Liste eingefügt werden." -#: ../src/interface.c:3443 +#: ../src/interface.c:3446 msgid "Double-clicking hides all additional widgets" -msgstr "" -"Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " -"an" +msgstr "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor an" -#: ../src/interface.c:3446 +#: ../src/interface.c:3449 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3448 +#: ../src/interface.c:3451 msgid "<b>Editor tabs</b>" msgstr "<b>Dateireiter</b>" -#: ../src/interface.c:3484 ../src/interface.c:3502 ../src/interface.c:3520 +#: ../src/interface.c:3487 +#: ../src/interface.c:3505 +#: ../src/interface.c:3523 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3485 ../src/interface.c:3503 ../src/interface.c:3521 +#: ../src/interface.c:3488 +#: ../src/interface.c:3506 +#: ../src/interface.c:3524 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3487 +#: ../src/interface.c:3490 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3523 +#: ../src/interface.c:3526 msgid "<b>Tab positions</b>" msgstr "<b>Reiterposition</b>" -#: ../src/interface.c:3563 +#: ../src/interface.c:3566 msgid "Show T_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3567 +#: ../src/interface.c:3570 msgid "_Append Toolbar to the Menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3570 +#: ../src/interface.c:3573 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " -"Platz zu sparen." +msgstr "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen Platz zu sparen." -#: ../src/interface.c:3592 ../src/toolbar.c:930 +#: ../src/interface.c:3595 +#: ../src/toolbar.c:931 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3612 +#: ../src/interface.c:3615 msgid "System _Default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3620 +#: ../src/interface.c:3623 msgid "Images _and Text" msgstr "Symbole _und Text" -#: ../src/interface.c:3628 +#: ../src/interface.c:3631 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:3636 +#: ../src/interface.c:3639 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:3644 +#: ../src/interface.c:3647 msgid "<b>Icon Style</b>" msgstr "<b>Symbolstil</b>" -#: ../src/interface.c:3665 +#: ../src/interface.c:3668 msgid "S_ystem Default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3673 +#: ../src/interface.c:3676 msgid "_Small Icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:3681 +#: ../src/interface.c:3684 msgid "_Very Small Icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:3689 +#: ../src/interface.c:3692 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:3697 +#: ../src/interface.c:3700 msgid "<b>Icon Size</b>" msgstr "<b>Symbolgröße:</b>" -#: ../src/interface.c:3702 +#: ../src/interface.c:3705 msgid "<b>Toolbar</b>" msgstr "<b>Werkzeugleiste</b>" -#: ../src/interface.c:3707 ../src/prefs.c:1555 +#: ../src/interface.c:3710 +#: ../src/prefs.c:1555 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3734 +#: ../src/interface.c:3737 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3737 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " -"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " -"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: ../src/interface.c:3740 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3739 +#: ../src/interface.c:3742 msgid "\"Smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home)" -#: ../src/interface.c:3742 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor " -"bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort " -"befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert " -"ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " -"Position Rücksicht zu nehmen." +#: ../src/interface.c:3745 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle Position Rücksicht zu nehmen." -#: ../src/interface.c:3744 +#: ../src/interface.c:3747 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3747 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " -"markierter Text mit der Maus verschoben werden kann." +#: ../src/interface.c:3750 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3749 +#: ../src/interface.c:3752 msgid "Code folding" msgstr "Quelltext-Ausblendung" -#: ../src/interface.c:3753 +#: ../src/interface.c:3756 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3756 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei " -"gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " -"Symbol geklickt wird." +#: ../src/interface.c:3759 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das Symbol geklickt wird." -#: ../src/interface.c:3758 +#: ../src/interface.c:3761 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3761 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: ../src/interface.c:3764 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3763 +#: ../src/interface.c:3766 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3766 +#: ../src/interface.c:3769 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "" -"Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende " -"einer Zeile automatisch entfernt werden sollen" +msgstr "Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende einer Zeile automatisch entfernt werden sollen" -#: ../src/interface.c:3772 +#: ../src/interface.c:3775 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3786 +#: ../src/interface.c:3789 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3793 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den " -"Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " -"werden kann." +#: ../src/interface.c:3796 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet werden kann." -#: ../src/interface.c:3795 +#: ../src/interface.c:3798 msgid "<b>Features</b>" msgstr "<b>Funktionen</b>" -#: ../src/interface.c:3800 +#: ../src/interface.c:3803 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3813 -msgid "" -"Note: To apply these settings to all currently open documents, use " -"<i>Project->Apply Default Indentation</i>." -msgstr "" -"Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, " -"bitte nutzen Sie <i>Projekt->Standardeinrückung anwenden</i>." +#: ../src/interface.c:3816 +msgid "Note: To apply these settings to all currently open documents, use <i>Project->Apply Default Indentation</i>." +msgstr "Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, bitte nutzen Sie <i>Projekt->Standardeinrückung anwenden</i>." -#: ../src/interface.c:3840 ../src/interface.c:5463 +#: ../src/interface.c:3843 +#: ../src/interface.c:5484 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3853 ../src/interface.c:5476 +#: ../src/interface.c:3856 +#: ../src/interface.c:5497 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3854 ../src/interface.c:5477 +#: ../src/interface.c:3857 +#: ../src/interface.c:5498 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3855 ../src/interface.c:5478 +#: ../src/interface.c:3858 +#: ../src/interface.c:5499 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3857 ../src/interface.c:4183 ../src/interface.c:5480 +#: ../src/interface.c:3860 +#: ../src/interface.c:4202 +#: ../src/interface.c:5501 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3864 ../src/interface.c:5487 +#: ../src/interface.c:3867 +#: ../src/interface.c:5508 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3877 ../src/interface.c:5500 +#: ../src/interface.c:3880 +#: ../src/interface.c:5521 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3887 ../src/interface.c:5510 +#: ../src/interface.c:3890 +#: ../src/interface.c:5531 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3896 ../src/interface.c:5519 +#: ../src/interface.c:3899 +#: ../src/interface.c:5540 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3905 ../src/interface.c:5528 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Benutzt Leerzeichen, falls die Einrückung kleiner ist als die " -"Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" +#: ../src/interface.c:3908 +#: ../src/interface.c:5549 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Benutzt Leerzeichen, falls die Einrückung kleiner ist als die Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" -#: ../src/interface.c:3914 ../src/interface.c:5537 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung " -"(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " -"bestimmen" +#: ../src/interface.c:3917 +#: ../src/interface.c:5558 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung (Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3916 +#: ../src/interface.c:3919 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3919 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein " -"Tabulatorzeichen einzufügen" +#: ../src/interface.c:3922 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein Tabulatorzeichen einzufügen" -#: ../src/interface.c:3921 +#: ../src/interface.c:3924 msgid "<b>Indentation</b>" msgstr "<b>Einrückung</b>" -#: ../src/interface.c:3926 ../src/interface.c:5539 +#: ../src/interface.c:3929 +#: ../src/interface.c:5560 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3949 +#: ../src/interface.c:3952 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3952 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " -"komplexeren Text erweitert werden" +#: ../src/interface.c:3955 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden" -#: ../src/interface.c:3954 +#: ../src/interface.c:3957 msgid "XML/HTML tag auto-closing" msgstr "Automatischen Schließen von XML/HTML-Tag " -#: ../src/interface.c:3957 +#: ../src/interface.c:3960 msgid "Insert matching closing tag for XML/HTML" msgstr "Passendes schließendes Tag für XML/HTML einfügen" -#: ../src/interface.c:3959 +#: ../src/interface.c:3962 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3962 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine " -"neue Zeile innerhalb eines Kommentars hinzugefügt wird." +#: ../src/interface.c:3965 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3964 +#: ../src/interface.c:3967 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3967 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " -"aus den geöffneten Dateien" +#: ../src/interface.c:3970 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen aus den geöffneten Dateien" -#: ../src/interface.c:3969 +#: ../src/interface.c:3972 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3973 +#: ../src/interface.c:3976 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3983 +#: ../src/interface.c:3986 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3990 +#: ../src/interface.c:3993 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3997 +#: ../src/interface.c:4000 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:4010 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" +#: ../src/interface.c:4013 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" msgstr "Die Anzahl der Zeichen, die nötig sind um die Vorschläge anzuzeigen" -#: ../src/interface.c:4019 +#: ../src/interface.c:4022 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:4028 +#: ../src/interface.c:4031 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "" -"Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste " -"angezeigt wird" +msgstr "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste angezeigt wird" -#: ../src/interface.c:4031 +#: ../src/interface.c:4034 +msgid "Symbol list update frequency:" +msgstr "Aktualisierungsfrequenz der Symbolliste:" + +#: ../src/interface.c:4047 +msgid "Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates." +msgstr "Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die dynamischen Aktualisierungen." + +#: ../src/interface.c:4050 msgid "<b>Completions</b>" msgstr "<b>Vervollständigungen</b>" -#: ../src/interface.c:4050 +#: ../src/interface.c:4069 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:4055 +#: ../src/interface.c:4074 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4057 +#: ../src/interface.c:4076 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:4062 +#: ../src/interface.c:4081 msgid "Auto-close single quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" -#: ../src/interface.c:4064 +#: ../src/interface.c:4083 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:4069 +#: ../src/interface.c:4088 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4071 +#: ../src/interface.c:4090 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:4076 +#: ../src/interface.c:4095 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" -"Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " -"Klammer" +msgstr "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4078 +#: ../src/interface.c:4097 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:4083 +#: ../src/interface.c:4102 msgid "Auto-close double quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" -#: ../src/interface.c:4085 +#: ../src/interface.c:4104 msgid "<b>Auto-close quotes and brackets</b>" msgstr "<b>Automatisches Schließen von Klammern und Anführungszeichen</b>" -#: ../src/interface.c:4090 +#: ../src/interface.c:4109 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:4113 +#: ../src/interface.c:4132 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:4116 +#: ../src/interface.c:4135 msgid "Invert all colors, by default using white text on a black background" -msgstr "" -"Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf " -"einem schwarzen Hintergrund genutzt." +msgstr "Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf einem schwarzen Hintergrund genutzt." -#: ../src/interface.c:4118 +#: ../src/interface.c:4137 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:4121 +#: ../src/interface.c:4140 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" +msgstr "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:4123 +#: ../src/interface.c:4142 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:4126 +#: ../src/interface.c:4145 msgid "Marks spaces with dots and tabs with arrows" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5802] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5802 http://geany.svn.sourceforge.net/geany/?rev=5802&view=rev Author: statc Date: 2011-05-21 08:45:34 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5561..5580) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/geany.glade branches/sm/plugins/export.c branches/sm/src/interface.c branches/sm/src/makefile.win32 branches/sm/src/search.c branches/sm/src/sidebar.c branches/sm/src/sidebar.h branches/sm/src/symbols.c branches/sm/tagmanager/c.c branches/sm/tagmanager/mio/COPYING branches/sm/tagmanager/mio/Makefile.am branches/sm/wscript Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/ChangeLog 2011-05-21 08:45:34 UTC (rev 5802) @@ -1,3 +1,64 @@ +2011-03-06 Colomban Wendling <colomban(at)geany(dot)org> + + * src/symbols.c: + When sorting tags by line, also sort by scope if line is the same, avoiding + wrong sorting if a parent tag is on the same line than its children, and one + of it's children would be sorted before alphabetically (closes #3193982). + + +2011-03-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/interface.c, geany.glade: + Fix typo. + * src/search.c: + Remember Find and Replace options across restarts + (patch by Dimitar Zhekov, thanks). + Cleanup. + Respect saved state of 'Case sensitive' option when using + the 'Regular expressions' option as well. + * plugins/export.c: + Add option to insert line numbers (closes #3197150). + Cleanup. + Use the full filename and add the extension of the export format. + + +2011-03-05 Colomban Wendling <colomban(at)geany(dot)org> + + * configure.ac, wscript, makefile.win32, src/Makefile.am, + src/makefile.win32, tagmanager/Makefile.am, tagmanager/c.c, + tagmanager/entry.c, tagmanager/entry.h, tagmanager/fortran.c, + tagmanager/get.c, tagmanager/get.h, tagmanager/js.c, tagmanager/lregex.c, + tagmanager/makefile.win32, tagmanager/parse.c, tagmanager/read.c, + tagmanager/read.h, tagmanager/sort.c, tagmanager/sql.c, + tagmanager/strlist.c, tagmanager/mio/*: + Move most of TagManager's I/O to MIO. + * src/document.c: + Enable in-memory tag parsing. + * geany.glade, src/editor.c, src/editor.h, src/interface.c, src/keyfile.c: + Add possibility to update symbol list in IDLE time, enabled by default + using a minimal delay of 250ms. + * src/symbols.c: + Improve implementation of hide_empty_rows() to do all in one shot. + * tagmanager/include/tm_tag.h, tagmanager/tm_project.c, + tagmanager/tm_source_file.c, tagmanager/tm_tag.c, + tagmanager/tm_workspace.c: + Make TMTag reference-counted. + * src/sidebar.c, src/symbols.c, tagmanager/include/tm_tag.h, + tagmanager/tm_tag.c: + Provide a GType for TMTag and use it in the tag store to make sure + the tags it holds are always valid. + * src/sidebar.c: + Don't remove and add the symbols tree view if we re-add the same one. + * src/sidebar.c, src/sidebar.h, src/symbols.c: + Update the symbol list rather than clearing and re-building it. + There is room for improvement in the implementation side, but it + is harder to do, probably a future improvement. + * tagmanager/c.c: + Fix suffix of anonymous symbols (structs, enums, ...). + * tagmanager/c.c: + Plug a memory leak. + + 2011-03-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/saveactions.c: Modified: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/geany.glade 2011-05-21 08:45:34 UTC (rev 5802) @@ -6827,7 +6827,7 @@ <child> <widget class="GtkSpinButton" id="spin_symbol_update_freq"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates.</property> + <property name="tooltip" translatable="yes">Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates.</property> <property name="can_focus">True</property> <property name="climb_rate">1</property> <property name="digits">0</property> Modified: branches/sm/plugins/export.c =================================================================== --- branches/sm/plugins/export.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/plugins/export.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -100,7 +100,8 @@ DATE_TYPE_HTML }; -typedef void (*ExportFunc) (GeanyDocument *doc, const gchar *filename, gboolean use_zoom); +typedef void (*ExportFunc) (GeanyDocument *doc, const gchar *filename, + gboolean use_zoom, gboolean insert_line_numbers); typedef struct { GeanyDocument *doc; @@ -109,8 +110,10 @@ } ExportInfo; static void on_file_save_dialog_response(GtkDialog *dialog, gint response, gpointer user_data); -static void write_html_file(GeanyDocument *doc, const gchar *filename, gboolean use_zoom); -static void write_latex_file(GeanyDocument *doc, const gchar *filename, gboolean use_zoom); +static void write_html_file(GeanyDocument *doc, const gchar *filename, + gboolean use_zoom, gboolean insert_line_numbers); +static void write_latex_file(GeanyDocument *doc, const gchar *filename, + gboolean use_zoom, gboolean insert_line_numbers); /* converts a RGB colour into a LaTeX compatible representation, taken from SciTE */ @@ -149,14 +152,14 @@ static void create_file_save_as_dialog(const gchar *extension, ExportFunc func, gboolean show_zoom_level_checkbox) { - GtkWidget *dialog; + GtkWidget *dialog, *vbox; GeanyDocument *doc; ExportInfo *exi; - if (extension == NULL) - return; + g_return_if_fail(extension != NULL); doc = document_get_current(); + g_return_if_fail(doc != NULL); exi = g_new(ExportInfo, 1); exi->doc = doc; @@ -175,20 +178,31 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + /* file chooser extra widget */ + vbox = gtk_vbox_new(FALSE, 0); + gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox); + { + GtkWidget *check_line_numbers; + + check_line_numbers = gtk_check_button_new_with_mnemonic(_("_Insert line numbers")); + ui_widget_set_tooltip_text(check_line_numbers, + _("Insert line numbers before each line in the exported document")); + gtk_box_pack_start(GTK_BOX(vbox), check_line_numbers, FALSE, FALSE, 0); + gtk_widget_show_all(vbox); + + ui_hookup_widget(dialog, check_line_numbers, "check_line_numbers"); + } if (show_zoom_level_checkbox) { - GtkWidget *vbox, *check_zoom_level; + GtkWidget *check_zoom_level; - vbox = gtk_vbox_new(FALSE, 0); check_zoom_level = gtk_check_button_new_with_mnemonic(_("_Use current zoom level")); ui_widget_set_tooltip_text(check_zoom_level, _("Renders the font size of the document together with the current zoom level")); gtk_box_pack_start(GTK_BOX(vbox), check_zoom_level, FALSE, FALSE, 0); gtk_widget_show_all(vbox); - gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox); ui_hookup_widget(dialog, check_zoom_level, "check_zoom_level"); - exi->have_zoom_level_checkbox = TRUE; } @@ -202,7 +216,6 @@ if (doc->file_name != NULL) { gchar *base_name = g_path_get_basename(doc->file_name); - gchar *short_name = utils_remove_ext_from_filename(base_name); gchar *file_name; gchar *locale_filename; gchar *locale_dirname; @@ -211,7 +224,7 @@ if (g_str_has_suffix(doc->file_name, extension)) suffix = "_export"; - file_name = g_strconcat(short_name, suffix, extension, NULL); + file_name = g_strconcat(base_name, suffix, extension, NULL); locale_filename = utils_get_locale_from_utf8(doc->file_name); locale_dirname = g_path_get_dirname(locale_filename); /* set the current name to base_name.html which probably doesn't exist yet so @@ -221,7 +234,6 @@ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), file_name); g_free(locale_dirname); g_free(locale_filename); - g_free(short_name); g_free(file_name); g_free(base_name); } @@ -299,6 +311,7 @@ { gchar *new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); gchar *utf8_filename; + gboolean insert_line_numbers; gboolean use_zoom_level = FALSE; if (exi->have_zoom_level_checkbox) @@ -306,6 +319,8 @@ use_zoom_level = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( ui_lookup_widget(GTK_WIDGET(dialog), "check_zoom_level"))); } + insert_line_numbers = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + ui_lookup_widget(GTK_WIDGET(dialog), "check_line_numbers"))); utf8_filename = utils_get_utf8_from_locale(new_filename); @@ -318,7 +333,7 @@ return; } - exi->export_func(exi->doc, new_filename, use_zoom_level); + exi->export_func(exi->doc, new_filename, use_zoom_level, insert_line_numbers); g_free(utf8_filename); g_free(new_filename); @@ -328,10 +343,30 @@ } -static void write_latex_file(GeanyDocument *doc, const gchar *filename, gboolean use_zoom) +/* returns the "width" (count of needed characters) for the given number */ +static gint get_line_numbers_arity(gint line_number) { + gint a = 0; + while ((line_number /= 10) != 0) + a++; + return a; +} + + +static gint get_line_number_width(GeanyDocument *doc) +{ + gint line_count = sci_get_line_count(doc->editor->sci); + return get_line_numbers_arity(line_count); +} + + +static void write_latex_file(GeanyDocument *doc, const gchar *filename, + gboolean use_zoom, gboolean insert_line_numbers) +{ GeanyEditor *editor = doc->editor; + ScintillaObject *sci = doc->editor->sci; gint i, doc_len, style = -1, old_style = 0, column = 0; + gint k, line_number, line_number_width, line_number_max_width = 0, pad; gchar c, c_next, *tmp, *date; /* 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1) */ gint styles[STYLE_MAX + 1][MAX_TYPES]; @@ -339,27 +374,44 @@ GString *body; GString *cmds; GString *latex; - gint style_max = pow(2, scintilla_send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, scintilla_send_message(sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0); - styles[i][BACK] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0); - styles[i][BOLD] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = scintilla_send_message(sci, SCI_STYLEGETFORE, i, 0); + styles[i][BACK] = scintilla_send_message(sci, SCI_STYLEGETBACK, i, 0); + styles[i][BOLD] = scintilla_send_message(sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = scintilla_send_message(sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } + if (insert_line_numbers) + line_number_max_width = get_line_number_width(doc); + /* read the document and write the LaTeX code */ body = g_string_new(""); - doc_len = sci_get_length(doc->editor->sci); + doc_len = sci_get_length(sci); for (i = 0; i < doc_len; i++) { - style = sci_get_style_at(doc->editor->sci, i); - c = sci_get_char_at(doc->editor->sci, i); - c_next = sci_get_char_at(doc->editor->sci, i + 1); + style = sci_get_style_at(sci, i); + c = sci_get_char_at(sci, i); + c_next = sci_get_char_at(sci, i + 1); + /* line numbers */ + if (insert_line_numbers && column == 0) + { + line_number = sci_get_line_from_position(sci, i) + 1; + line_number_width = get_line_numbers_arity(line_number); + /* padding */ + pad = line_number_max_width - line_number_width; + for (k = 0; k < pad; k++) + { + g_string_append(body, " "); + } + g_string_append_printf(body, "%d ", line_number); + } + if (style != old_style || ! block_open) { old_style = style; @@ -536,10 +588,13 @@ } -static void write_html_file(GeanyDocument *doc, const gchar *filename, gboolean use_zoom) +static void write_html_file(GeanyDocument *doc, const gchar *filename, + gboolean use_zoom, gboolean insert_line_numbers) { GeanyEditor *editor = doc->editor; + ScintillaObject *sci = doc->editor->sci; gint i, doc_len, style = -1, old_style = 0, column = 0; + gint k, line_number, line_number_width, line_number_max_width = 0, pad; gchar c, c_next, *date; /* 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1) */ gint styles[STYLE_MAX + 1][MAX_TYPES]; @@ -550,15 +605,15 @@ GString *body; GString *css; GString *html; - gint style_max = pow(2, scintilla_send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, scintilla_send_message(sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = ROTATE_RGB(scintilla_send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0)); - styles[i][BACK] = ROTATE_RGB(scintilla_send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0)); - styles[i][BOLD] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = scintilla_send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = ROTATE_RGB(scintilla_send_message(sci, SCI_STYLEGETFORE, i, 0)); + styles[i][BACK] = ROTATE_RGB(scintilla_send_message(sci, SCI_STYLEGETBACK, i, 0)); + styles[i][BOLD] = scintilla_send_message(sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = scintilla_send_message(sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } @@ -567,20 +622,37 @@ font_name = pango_font_description_get_family(font_desc); /*font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE;*/ /* take the zoom level also into account */ - font_size = scintilla_send_message(doc->editor->sci, SCI_STYLEGETSIZE, 0, 0); + font_size = scintilla_send_message(sci, SCI_STYLEGETSIZE, 0, 0); if (use_zoom) - font_size += scintilla_send_message(doc->editor->sci, SCI_GETZOOM, 0, 0); + font_size += scintilla_send_message(sci, SCI_GETZOOM, 0, 0); + if (insert_line_numbers) + line_number_max_width = get_line_number_width(doc); + /* read the document and write the HTML body */ body = g_string_new(""); - doc_len = sci_get_length(doc->editor->sci); + doc_len = sci_get_length(sci); for (i = 0; i < doc_len; i++) { - style = sci_get_style_at(doc->editor->sci, i); - c = sci_get_char_at(doc->editor->sci, i); + style = sci_get_style_at(sci, i); + c = sci_get_char_at(sci, i); /* sci_get_char_at() takes care of index boundaries and return 0 if i is too high */ - c_next = sci_get_char_at(doc->editor->sci, i + 1); + c_next = sci_get_char_at(sci, i + 1); + /* line numbers */ + if (insert_line_numbers && column == 0) + { + line_number = sci_get_line_from_position(sci, i) + 1; + line_number_width = get_line_numbers_arity(line_number); + /* padding */ + pad = line_number_max_width - line_number_width; + for (k = 0; k < pad; k++) + { + g_string_append(body, " "); + } + g_string_append_printf(body, "%d ", line_number); + } + if ((style != old_style || ! span_open) && ! isspace(c)) { old_style = style; Modified: branches/sm/src/interface.c =================================================================== --- branches/sm/src/interface.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/interface.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -4055,7 +4055,7 @@ gtk_table_attach (GTK_TABLE (table14), spin_symbol_update_freq, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_symbol_update_freq, _("Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates."), NULL); + gtk_tooltips_set_tip (tooltips, spin_symbol_update_freq, _("Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates."), NULL); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbol_update_freq), TRUE); label177 = gtk_label_new (_("<b>Completions</b>")); Modified: branches/sm/src/makefile.win32 =================================================================== --- branches/sm/src/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/makefile.win32 2011-05-21 08:45:34 UTC (rev 5802) @@ -91,9 +91,9 @@ binclean: $(RM) $(TARGET) -$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a +$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ - ../scintilla/scintilla.a ../tagmanager/mio∕mio.a ../tagmanager/tagmanager.a \ + ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \ $(ALL_GTK_LIBS) $(WIN_LIBS) deps.mak: Modified: branches/sm/src/search.c =================================================================== --- branches/sm/src/search.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/search.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -90,10 +90,25 @@ gchar *fif_extra_options; gboolean fif_use_files; gchar *fif_files; + gboolean find_regexp; + gboolean find_escape_sequences; + gboolean find_case_sensitive; + gboolean find_match_whole_word; + gboolean find_match_word_start; + gboolean find_close_dialog; + gboolean replace_regexp; + gboolean replace_escape_sequences; + gboolean replace_case_sensitive; + gboolean replace_match_whole_word; + gboolean replace_match_word_start; + gboolean replace_search_backwards; + gboolean replace_close_dialog; } -settings = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL, FALSE, NULL}; +settings; static StashGroup *fif_prefs = NULL; +static StashGroup *find_prefs = NULL; +static StashGroup *replace_prefs = NULL; static struct @@ -176,6 +191,8 @@ stash_group_add_integer(group, &fif_dlg.position[0], "position_fif_x", -1); stash_group_add_integer(group, &fif_dlg.position[1], "position_fif_y", -1); + memset(&settings, '\0', sizeof(settings)); + group = stash_group_new("search"); fif_prefs = group; configuration_add_pref_group(group, FALSE); @@ -197,6 +214,41 @@ "fif_files", "", "entry_files"); stash_group_add_toggle_button(group, &settings.fif_use_files, "fif_use_files", FALSE, "check_files"); + + group = stash_group_new("search"); + find_prefs = group; + configuration_add_pref_group(group, FALSE); + /* if case is moved after regexp, the first regexp uncheck will clear it */ + stash_group_add_toggle_button(group, &settings.find_case_sensitive, + "find_case_sensitive", FALSE, "check_case"); + stash_group_add_toggle_button(group, &settings.find_regexp, + "find_regexp", FALSE, "check_regexp"); + stash_group_add_toggle_button(group, &settings.find_escape_sequences, + "find_escape_sequences", FALSE, "check_escape"); + stash_group_add_toggle_button(group, &settings.find_match_whole_word, + "find_match_whole_word", FALSE, "check_word"); + stash_group_add_toggle_button(group, &settings.find_match_word_start, + "find_match_word_start", FALSE, "check_wordstart"); + stash_group_add_toggle_button(group, &settings.find_close_dialog, + "find_close_dialog", TRUE, "check_close"); + + group = stash_group_new("search"); + replace_prefs = group; + configuration_add_pref_group(group, FALSE); + stash_group_add_toggle_button(group, &settings.replace_case_sensitive, + "replace_case_sensitive", FALSE, "check_case"); + stash_group_add_toggle_button(group, &settings.replace_regexp, + "replace_regexp", FALSE, "check_regexp"); + stash_group_add_toggle_button(group, &settings.replace_escape_sequences, + "replace_escape_sequences", FALSE, "check_escape"); + stash_group_add_toggle_button(group, &settings.replace_match_whole_word, + "replace_match_whole_word", FALSE, "check_word"); + stash_group_add_toggle_button(group, &settings.replace_match_word_start, + "replace_match_word_start", FALSE, "check_wordstart"); + stash_group_add_toggle_button(group, &settings.replace_search_backwards, + "replace_search_backwards", FALSE, "check_back"); + stash_group_add_toggle_button(group, &settings.replace_close_dialog, + "replace_close_dialog", TRUE, "check_close"); } @@ -468,7 +520,6 @@ gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); ui_widget_set_tooltip_text(check_close, _("Disable this option to keep the dialog open")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_close), TRUE); gtk_container_add(GTK_CONTAINER(bbox), check_close); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), check_close, TRUE); @@ -499,6 +550,7 @@ if (find_dlg.dialog == NULL) { create_find_dialog(); + stash_group_display(find_prefs, find_dlg.dialog); if (sel) gtk_entry_set_text(GTK_ENTRY(find_dlg.entry), sel); @@ -652,7 +704,6 @@ gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); ui_widget_set_tooltip_text(check_close, _("Disable this option to keep the dialog open")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_close), TRUE); gtk_container_add(GTK_CONTAINER(bbox), check_close); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), check_close, TRUE); @@ -677,6 +728,7 @@ if (replace_dlg.dialog == NULL) { create_replace_dialog(); + stash_group_display(replace_prefs, replace_dlg.dialog); if (sel) gtk_entry_set_text(GTK_ENTRY(replace_dlg.find_entry), sel); @@ -696,6 +748,7 @@ /* bring the dialog back in the foreground in case it is already open but the focus is away */ gtk_window_present(GTK_WINDOW(replace_dlg.dialog)); } + g_free(sel); } @@ -984,30 +1037,30 @@ GtkToggleButton *check_case = GTK_TOGGLE_BUTTON( ui_lookup_widget(dialog, "check_case")); GtkWidget *check_escape = ui_lookup_widget(dialog, "check_escape"); - static gboolean case_state = FALSE; /* state before regex enabled */ + gboolean replace = (dialog != find_dlg.dialog); + const char *back_button[2] = { "btn_previous" , "check_back" }; + static gboolean case_state[2] = { FALSE, FALSE }; /* state before regex enabled */ /* hide options that don't apply to regex searches */ gtk_widget_set_sensitive(check_escape, ! regex_set); - - if (dialog == find_dlg.dialog) - gtk_widget_set_sensitive(ui_lookup_widget(dialog, "btn_previous"), ! regex_set); - else - gtk_widget_set_sensitive(ui_lookup_widget(dialog, "check_back"), ! regex_set); - + gtk_widget_set_sensitive(ui_lookup_widget(dialog, back_button[replace]), ! regex_set); gtk_widget_set_sensitive(check_word, ! regex_set); gtk_widget_set_sensitive(check_wordstart, ! regex_set); if (regex_set) /* regex enabled */ { - /* Enable case sensitive but remember original case toggle state */ - case_state = gtk_toggle_button_get_active(check_case); - gtk_toggle_button_set_active(check_case, TRUE); + if (GTK_WIDGET_VISIBLE(dialog)) + { + /* Enable case sensitive but remember original case toggle state */ + case_state[replace] = gtk_toggle_button_get_active(check_case); + gtk_toggle_button_set_active(check_case, TRUE); + } } else /* regex disabled */ { /* If case sensitive is still enabled, revert to what it was before we enabled it */ if (gtk_toggle_button_get_active(check_case) == TRUE) - gtk_toggle_button_set_active(check_case, case_state); + gtk_toggle_button_set_active(check_case, case_state[replace]); } } } @@ -1056,52 +1109,38 @@ } -static gint get_search_flags(GtkWidget *dialog) -{ - gboolean fl1, fl2, fl3, fl4; +#define int_search_flags(match_case, whole_word, regexp, word_start) \ + ((match_case ? SCFIND_MATCHCASE : 0) | \ + (whole_word ? SCFIND_WHOLEWORD : 0) | \ + (regexp ? SCFIND_REGEXP | SCFIND_POSIX : 0) | \ + (word_start ? SCFIND_WORDSTART : 0)) - fl1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(dialog, "check_case"))); - fl2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(dialog, "check_word"))); - fl3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(dialog, "check_regexp"))); - fl4 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(dialog, "check_wordstart"))); - return (fl1 ? SCFIND_MATCHCASE : 0) | - (fl2 ? SCFIND_WHOLEWORD : 0) | - (fl3 ? SCFIND_REGEXP | SCFIND_POSIX : 0) | - (fl4 ? SCFIND_WORDSTART : 0); -} - - static void on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { gtk_window_get_position(GTK_WINDOW(find_dlg.dialog), &find_dlg.position[0], &find_dlg.position[1]); + stash_group_update(find_prefs, find_dlg.dialog); + if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) gtk_widget_hide(find_dlg.dialog); else { GeanyDocument *doc = document_get_current(); - gboolean search_replace_escape; - gboolean check_close = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(find_dlg.dialog), "check_close"))); + gboolean check_close = settings.find_close_dialog; if (doc == NULL) return; - search_replace_escape = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(find_dlg.dialog), "check_escape"))); search_data.backwards = FALSE; search_data.search_bar = FALSE; g_free(search_data.text); search_data.text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(user_data))))); - search_data.flags = get_search_flags(find_dlg.dialog); + search_data.flags = int_search_flags(settings.find_case_sensitive, + settings.find_match_whole_word, settings.find_regexp, settings.find_match_word_start); if (strlen(search_data.text) == 0) { @@ -1110,7 +1149,7 @@ gtk_widget_grab_focus(find_dlg.entry); return; } - if (search_replace_escape || search_data.flags & SCFIND_REGEXP) + if (settings.find_escape_sequences || search_data.flags & SCFIND_REGEXP) { if (! utils_str_replace_escape(search_data.text, search_data.flags & SCFIND_REGEXP)) goto fail; @@ -1209,28 +1248,27 @@ GeanyDocument *doc = document_get_current(); gint search_flags_re; gboolean search_backwards_re, search_replace_escape_re; - gboolean close_window; gchar *find, *replace; gtk_window_get_position(GTK_WINDOW(replace_dlg.dialog), &replace_dlg.position[0], &replace_dlg.position[1]); + stash_group_update(replace_prefs, replace_dlg.dialog); + if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { gtk_widget_hide(replace_dlg.dialog); return; } - close_window = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "check_close"))); - search_backwards_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "check_back"))); - search_replace_escape_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "check_escape"))); + search_backwards_re = settings.replace_search_backwards; + search_replace_escape_re = settings.replace_escape_sequences; find = g_strdup(gtk_entry_get_text(GTK_ENTRY(replace_dlg.find_entry))); replace = g_strdup(gtk_entry_get_text(GTK_ENTRY(replace_dlg.replace_entry))); - search_flags_re = get_search_flags(replace_dlg.dialog); + search_flags_re = int_search_flags(settings.replace_case_sensitive, + settings.replace_match_whole_word, settings.replace_regexp, + settings.replace_match_word_start); if ((response != GEANY_RESPONSE_FIND) && (search_flags_re & SCFIND_MATCHCASE) && (strcmp(find, replace) == 0)) @@ -1302,7 +1340,7 @@ case GEANY_RESPONSE_REPLACE_IN_SEL: case GEANY_RESPONSE_REPLACE_IN_FILE: case GEANY_RESPONSE_REPLACE_IN_SESSION: - if (close_window) + if (settings.replace_close_dialog) gtk_widget_hide(replace_dlg.dialog); } g_free(find); Modified: branches/sm/src/sidebar.c =================================================================== --- branches/sm/src/sidebar.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/sidebar.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -198,16 +198,26 @@ /* update = rescan the tags for doc->filename */ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) { - if (gtk_bin_get_child(GTK_BIN(tag_window))) - gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); + GtkWidget *child = gtk_bin_get_child(GTK_BIN(tag_window)); + /* changes the tree view to the given one, trying not to do useless changes */ + #define CHANGE_TREE(new_child) \ + G_STMT_START { \ + if (child != new_child) \ + { \ + if (child) \ + gtk_container_remove(GTK_CONTAINER(tag_window), child); \ + gtk_container_add(GTK_CONTAINER(tag_window), new_child); \ + } \ + } G_STMT_END + if (tv.default_tag_tree == NULL) create_default_tag_tree(); /* show default empty tag tree if there are no tags */ if (doc == NULL || doc->file_type == NULL || ! filetype_has_tags(doc->file_type)) { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + CHANGE_TREE(tv.default_tag_tree); return; } @@ -216,7 +226,7 @@ if (doc->priv->tag_tree == NULL) { doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING, G_TYPE_BOOLEAN); doc->priv->tag_tree = gtk_tree_view_new(); prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); gtk_widget_show(doc->priv->tag_tree); @@ -228,12 +238,14 @@ if (doc->has_tags) { - gtk_container_add(GTK_CONTAINER(tag_window), doc->priv->tag_tree); + CHANGE_TREE(doc->priv->tag_tree); } else { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + CHANGE_TREE(tv.default_tag_tree); } + + #undef CHANGE_TREE } @@ -856,7 +868,7 @@ if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter)) { - const TMTag *tag; + TMTag *tag; gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); if (! tag) Modified: branches/sm/src/sidebar.h =================================================================== --- branches/sm/src/sidebar.h 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/sidebar.h 2011-05-21 08:45:34 UTC (rev 5802) @@ -43,6 +43,7 @@ SYMBOLS_COLUMN_NAME, SYMBOLS_COLUMN_TAG, SYMBOLS_COLUMN_TOOLTIP, + SYMBOLS_COLUMN_VALID, SYMBOLS_N_COLUMNS }; Modified: branches/sm/src/symbols.c =================================================================== --- branches/sm/src/symbols.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/src/symbols.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -451,16 +451,27 @@ } -/* sort by line only */ +/* sort by line, then scope */ static gint compare_symbol_lines(gconstpointer a, gconstpointer b) { const TMTag *tag_a = TM_TAG(a); const TMTag *tag_b = TM_TAG(b); + gint ret; if (a == NULL || b == NULL) return 0; - return tag_a->atts.entry.line - tag_b->atts.entry.line; + ret = tag_a->atts.entry.line - tag_b->atts.entry.line; + if (ret == 0) + { + if (tag_a->atts.entry.scope == NULL) + return -(tag_a->atts.entry.scope != tag_b->atts.entry.scope); + if (tag_b->atts.entry.scope == NULL) + return tag_a->atts.entry.scope != tag_b->atts.entry.scope; + else + return strcmp(tag_a->atts.entry.scope, tag_b->atts.entry.scope); + } + return ret; } @@ -547,6 +558,71 @@ } +/* finds the next iter at any level + * @param iter in/out, the current iter, will be changed to the next one + * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ +static gboolean next_iter(GtkTreeModel *model, GtkTreeIter *iter) +{ + GtkTreeIter guess; + GtkTreeIter copy = *iter; + + /* go down if the item has children */ + if (gtk_tree_model_iter_children(model, &guess, iter)) + *iter = guess; + /* or to the next item at the same level */ + else if (gtk_tree_model_iter_next(model, &copy)) + *iter = copy; + /* or to the next item at a parent level */ + else if (gtk_tree_model_iter_parent(model, &guess, iter)) + { + copy = guess; + while(TRUE) + { + if (gtk_tree_model_iter_next(model, &copy)) + { + *iter = copy; + return TRUE; + } + else if (gtk_tree_model_iter_parent(model, &copy, &guess)) + guess = copy; + else + return FALSE; + } + } + else + return FALSE; + + return TRUE; +} + + +static gboolean find_toplevel_iter(GtkTreeStore *store, GtkTreeIter *iter, const gchar *title) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + + if (!gtk_tree_model_get_iter_first(model, iter)) + return FALSE; + do + { + gchar *candidate; + + gtk_tree_model_get(model, iter, SYMBOLS_COLUMN_NAME, &candidate, -1); + /* FIXME: what if 2 different items have the same name? + * this should never happen, but might be caused by a typo in a translation */ + if (utils_str_equal(candidate, title)) + { + g_free(candidate); + return TRUE; + } + else + g_free(candidate); + } + while (gtk_tree_model_iter_next(model, iter)); + + return FALSE; +} + + /* Adds symbol list groups in (iter*, title) pairs. * The list must be ended with NULL. */ static void G_GNUC_NULL_TERMINATED @@ -572,14 +648,15 @@ g_assert(title != NULL); g_ptr_array_add(top_level_iter_names, title); - gtk_tree_store_append(tree_store, iter, NULL); + if (!find_toplevel_iter(tree_store, iter, title)) + gtk_tree_store_append(tree_store, iter, NULL); if (G_IS_OBJECT(icon)) { gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, -1); g_object_unref(icon); } - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, SYMBOLS_COLUMN_VALID, TRUE, -1); } va_end(args); } @@ -1095,8 +1172,90 @@ } -static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash) +static gboolean tag_equal(gconstpointer v1, gconstpointer v2) { + const TMTag *t1 = v1; + const TMTag *t2 = v2; + + return (t1->type == t2->type && strcmp(t1->name, t2->name) == 0 && + utils_str_equal(t1->atts.entry.scope, t2->atts.entry.scope)); +} + + +/* inspired from g_str_hash() */ +static guint tag_hash(gconstpointer v) +{ + const TMTag *tag = v; + const signed char *p; + guint32 h = 5381; + + h = (h << 5) + h + tag->type; + for (p = tag->name; *p != '\0'; p++) + h = (h << 5) + h + *p; + if (tag->atts.entry.scope) + { + for (p = tag->atts.entry.scope; *p != '\0'; p++) + h = (h << 5) + h + *p; + } + + return h; +} + + +static GHashTable *build_iter_table(GtkTreeStore *store) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + GHashTable *table; + GtkTreeIter iter; + + table = g_hash_table_new_full(tag_hash, tag_equal, + (GDestroyNotify)tm_tag_unref, (GDestroyNotify)gtk_tree_path_free); + + if (!gtk_tree_model_get_iter_first(model, &iter)) + return table; + do + { + TMTag *tag; + + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); + if (tag) + g_hash_table_insert(table, tag, gtk_tree_model_get_path(model, &iter)); + } + while (next_iter(model, &iter)); + + return table; +} + + +static gboolean find_iter(GtkTreeStore *store, GHashTable *iter_hash, const TMTag *tag, + GtkTreeIter *iter) +{ + GtkTreePath *path; + + path = g_hash_table_lookup(iter_hash, tag); + if (path) + { + GtkTreeIter tmp; + gboolean valid; + + if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &tmp, path)) + return FALSE; + gtk_tree_model_get(GTK_TREE_MODEL(store), &tmp, SYMBOLS_COLUMN_VALID, &valid, -1); + /* if the row is valid it has already been updated, so it's simply a duplicate */ + if (!valid) + { + *iter = tmp; + return TRUE; + } + } + + return FALSE; +} + + +static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash, + GHashTable *iter_hash) +{ filetype_id ft_id = doc->file_type->id; GtkTreeStore *tree_store = doc->priv->tag_store; GtkTreeIter *parent = NULL; @@ -1137,13 +1296,30 @@ child = new_iter; } - gtk_tree_store_append(tree_store, child, parent); + if (!find_iter(tree_store, iter_hash, tag, child)) + { + gboolean expand = FALSE; + /* only expand to the iter if the parent was empty, otherwise we let the + * folding as it was before (already expanded, or closed by the user) */ + expand = !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(tree_store), parent); + gtk_tree_store_append(tree_store, child, parent); + if (expand) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store), child); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(doc->priv->tag_tree), path); + gtk_tree_path_free(path); + } + } + name = get_symbol_name(doc, tag, (parent_name != NULL)); gtk_tree_store_set(tree_store, child, SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_NAME, name, SYMBOLS_COLUMN_TAG, tag, + SYMBOLS_COLUMN_VALID, TRUE, -1); if (gtk_check_version(2, 12, 0) == NULL) @@ -1165,9 +1341,11 @@ { const GList *item; GHashTable *parent_hash; + GHashTable *iter_hash; /* Create a hash table "parent_tag_name":(GtkTreeIter*) */ parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); + iter_hash = build_iter_table(doc->priv->tag_store); /* find and store all parent names in the hash table */ for (item = tags; item; item = g_list_next(item)) @@ -1182,8 +1360,9 @@ { const TMTag *tag = item->data; - add_tree_tag(doc, tag, parent_hash); + add_tree_tag(doc, tag, parent_hash, iter_hash); } + g_hash_table_destroy(iter_hash); g_hash_table_destroy(parent_hash); } @@ -1288,6 +1467,53 @@ } +static void invalidate_rows(GtkTreeStore *store) +{ + GtkTreeIter iter; + GtkTreeModel *model = GTK_TREE_MODEL(store); + + if (!gtk_tree_model_get_iter_first(model, &iter)) + return; + do + { + gtk_tree_store_set(store, &iter, SYMBOLS_COLUMN_VALID, FALSE, -1); + } + while (next_iter(model, &iter)); +} + + +static void remove_invalid_rows(GtkTreeStore *store) +{ + GtkTreeIter iter; + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean cont; + + cont = gtk_tree_model_get_iter_first(model, &iter); + while (cont) + { + gboolean valid; + + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_VALID, &valid, -1); + if (!valid) + { + GtkTreeIter parent; + gboolean have_parent; + + have_parent = gtk_tree_model_iter_parent(model, &parent, &iter); + cont = gtk_tree_store_remove(store, &iter); + /* if there is no next at this level but there is a parent iter, continue from it */ + if (!cont && have_parent) + { + iter = parent; + cont = next_iter(model, &iter); + } + } + else + cont = next_iter(model, &iter); + } +} + + gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) { GList *tags; @@ -1298,19 +1524,22 @@ if (tags == NULL) return FALSE; - /* Make sure the model stays with us after the tree view unrefs it */ - g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store)); - /* Detach model from view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL); - /* Clear all contents */ - gtk_tree_store_clear(doc->priv->tag_store); + /* FIXME: Not sure why we detached the model here? */ + /* disable sorting during update because the code doesn't support correctly + * models that are currently being built */ + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(doc->priv->tag_store), GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0); + + /* invalidate all content */ + invalidate_rows(doc->priv->tag_store); + /* add grandparent type iters */ add_top_level_items(doc); add_tree_tags(doc, tags); g_list_free(tags); + remove_invalid_rows(doc->priv->tag_store); hide_empty_rows(doc->priv->tag_store); if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) @@ -1319,12 +1548,6 @@ sort_tree(doc->priv->tag_store, sort_mode == SYMBOLS_SORT_BY_NAME); doc->priv->symbol_list_sort_mode = sort_mode; - /* Re-attach model to view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), - GTK_TREE_MODEL(doc->priv->tag_store)); - g_object_unref(GTK_TREE_MODEL(doc->priv->tag_store)); - gtk_tree_view_expand_all(GTK_TREE_VIEW(doc->priv->tag_tree)); - return TRUE; } Modified: branches/sm/tagmanager/c.c =================================================================== --- branches/sm/tagmanager/c.c 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/tagmanager/c.c 2011-05-21 08:45:34 UTC (rev 5802) @@ -661,7 +661,7 @@ static const char *accessString (const accessType laccess) { - static const char *const names [] ={ + static const char *const names [] = { "?", "private", "protected", "public", "default" }; Assert (sizeof (names) / sizeof (names [0]) == ACCESS_COUNT); @@ -671,7 +671,7 @@ static const char *implementationString (const impType imp) { - static const char *const names [] ={ + static const char *const names [] = { "?", "abstract", "virtual", "pure virtual" }; Assert (sizeof (names) / sizeof (names [0]) == IMP_COUNT); @@ -691,7 +691,7 @@ { static const char *const names [] = { "none", "args", "}", "{", "comma", "double colon", "keyword", "name", - "package", "paren-name", "semicolon", "specifier", "*", "[]", "count" + "package", "paren-name", "semicolon", "specifier", "*", "[]" }; Assert (sizeof (names) / sizeof (names [0]) == TOKEN_COUNT); Assert ((int) type < TOKEN_COUNT); @@ -710,13 +710,14 @@ static const char *declString (const declType declaration) { - static const char *const names [] = { - "?", "base", "class", "enum", "function", "ignore", "interface", - "namespace", "no mangle", "package", "struct", "union", - }; - Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); - Assert ((int) declaration < DECL_COUNT); - return names[(int) declaration]; + static const char *const names [] = { + "?", "base", "class", "enum", "event", "signal", "function", + "function template", "ignore", "interface", "module", "namespace", + "no mangle", "package", "struct", "union", + }; + Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); + Assert ((int) declaration < DECL_COUNT); + return names[(int) declaration]; } static const char *keywordString (const keywordId keyword) @@ -953,8 +954,7 @@ initToken (st->blockName); vStringClear (st->parentClasses); - /* Init member info. - */ + /* Init member info. */ if (! partial) st->member.access = st->member.accessDefault; @@ -981,7 +981,7 @@ st->parent = parent; initMemberInfo (st); reinitStatement (st, FALSE); - if(parent) + if (parent) { const tokenInfo *const src = activeToken (parent); tokenInfo *const dst = activeToken (st); @@ -1182,11 +1182,11 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, const statementInfo *const st, vString *const scope) { - /* For selected tag types, append an extension flag designating the - * parent object in which the tag is defined. - */ - switch (type) - { + /* For selected tag types, append an extension flag designating the + * parent object in which the tag is defined. + */ + switch (type) + { default: break; case TAG_CLASS: @@ -1215,7 +1215,6 @@ if ((type == TAG_CLASS || type == TAG_INTERFACE || type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) { - tag->extensionFields.inheritance = vStringValue (st->parentClasses); } @@ -1547,7 +1546,8 @@ else if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC) makeTag (nameToken, st, TRUE, TAG_MEMBER); } - else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)); + else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) + ; else { if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName) @@ -2468,10 +2468,8 @@ skipToMatch ("()"); --depth; } - if (st->argEndPosition == 0) - { - st->argEndPosition = mio_tell(File.mio); - } + if (st->argEndPosition == 0) + st->argEndPosition = mio_tell (File.mio); if (! info->isNameCandidate) initToken (token); @@ -2519,7 +2517,8 @@ token->type = TOKEN_NAME; processName (st); st->gotParenName = TRUE; - if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME)) { + if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME)) + { st->declaration = DECL_FUNCTION_TEMPLATE; copyToken (st->blockName, prev); } @@ -2854,12 +2853,12 @@ static void tagCheck (statementInfo *const st) { - const tokenInfo *const token = activeToken (st); - const tokenInfo *const prev = prevToken (st, 1); - const tokenInfo *const prev2 = prevToken (st, 2); + const tokenInfo *const token = activeToken (st); + const tokenInfo *const prev = prevToken (st, 1); + const tokenInfo *const prev2 = prevToken (st, 2); - switch (token->type) - { + switch (token->type) + { case TOKEN_NAME: { if (insideEnumBody (st)) @@ -2891,6 +2890,7 @@ else if (isContextualStatement (st)) { tokenInfo *name_token = (tokenInfo *)prev; + boolean free_name_token = FALSE; if (isType (name_token, TOKEN_NAME)) { @@ -2927,6 +2927,7 @@ char buffer[64]; name_token = newToken (); + free_name_token = TRUE; copyToken (name_token, contextual_token); sprintf(buffer, "anon_%s_%d", name_token->name->buffer, contextual_fake_count++); @@ -2945,6 +2946,8 @@ } } qualifyBlockTag (st, name_token); + if (free_name_token) + deleteToken (name_token); } break; } @@ -3022,6 +3025,8 @@ exception_t exception; boolean retry; + contextual_fake_count = 0; + Assert (passCount < 3); cppInit ((boolean) (passCount > 1), isLanguage (Lang_csharp)); @@ -3060,56 +3065,48 @@ static void initializeCParser (const langType language) { - contextual_fake_count = 0; Lang_c = language; buildKeywordHash (language, 0); } static void initializeCppParser (const langType language) { - contextual_fake_count = 0; Lang_cpp = language; buildKeywordHash (language, 1); } static void initializeJavaParser (const langType language) { - contextual_fake_count = 0; Lang_java = language; buildKeywordHash (language, 3); } static void initializeDParser (const langType language) { - contextual_fake_count = 0; Lang_d = language; buildKeywordHash (language, 6); } static void initializeGLSLParser (const langType language) { - contextual_fake_count = 0; Lang_glsl = language; buildKeywordHash (language, 0); /* C keywords */ } static void initializeFeriteParser (const langType language) { - contextual_fake_count = 0; Lang_ferite = language; buildKeywordHash (language, 1); /* C++ keywords */ } static void initializeCsharpParser (const langType language) { - contextual_fake_count = 0; Lang_csharp = language; buildKeywordHash (language, 2); } static void initializeValaParser (const langType language) { - contextual_fake_count = 0; Lang_vala = language; buildKeywordHash (language, 5); } Modified: branches/sm/tagmanager/mio/COPYING =================================================================== --- branches/sm/tagmanager/mio/COPYING 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/tagmanager/mio/COPYING 2011-05-21 08:45:34 UTC (rev 5802) @@ -1,623 +1,282 @@ GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. Definitions. + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". - "This License" refers to version 3 of the GNU General Public License. +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: - A "covered work" means either the unmodified Program or a work based -on the Program. + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. - 1. Source Code. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) - The Corresponding Source for a work in source code form is that -same work. +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. - 2. Basic Permissions. +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to this License. - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. - 13. Use with the GNU Affero General Public License. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. - 14. Revised Versions of this License. +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. + NO WARRANTY - 15. Disclaimer of Warranty. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs @@ -628,15 +287,15 @@ To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least +convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> - This program is free software: you can redistribute it and/or modify + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -644,31 +303,37 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Modified: branches/sm/tagmanager/mio/Makefile.am =================================================================== --- branches/sm/tagmanager/mio/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/tagmanager/mio/Makefile.am 2011-05-21 08:45:34 UTC (rev 5802) @@ -9,5 +9,5 @@ EXTRA_DIST = \ mio.h \ - mio-file.c + mio-file.c \ mio-memory.c Modified: branches/sm/wscript =================================================================== --- branches/sm/wscript 2011-05-21 08:44:31 UTC (rev 5801) +++ branches/sm/wscript 2011-05-21 08:45:34 UTC (rev 5802) @@ -298,7 +298,7 @@ source = tagmanager_sources, name = 'tagmanager', target = 'tagmanager', - includes = ['.', 'tagmanager/include/', 'tagmanager/mio/'], + includes = ['.', 'tagmanager', 'tagmanager/include'], defines = 'G_LOG_DOMAIN="Tagmanager"', uselib = 'GTK', install_path = None) # do not install this library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5801] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5801 http://geany.svn.sourceforge.net/geany/?rev=5801&view=rev Author: statc Date: 2011-05-21 08:44:31 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5541..5560) Conflicts: src/Makefile.am wscript Modified Paths: -------------- branches/sm/AUTHORS branches/sm/COMMITTERS branches/sm/ChangeLog branches/sm/README branches/sm/README.Packagers branches/sm/configure.ac branches/sm/data/filetype_extensions.conf branches/sm/geany.glade branches/sm/makefile.win32 branches/sm/plugins/filebrowser.c branches/sm/plugins/saveactions.c branches/sm/src/Makefile.am branches/sm/src/about.c branches/sm/src/document.c branches/sm/src/editor.c branches/sm/src/editor.h branches/sm/src/interface.c branches/sm/src/keyfile.c branches/sm/src/makefile.win32 branches/sm/src/sciwrappers.c branches/sm/src/sidebar.c branches/sm/src/symbols.c branches/sm/src/templates.c branches/sm/tagmanager/Makefile.am branches/sm/tagmanager/c.c branches/sm/tagmanager/entry.c branches/sm/tagmanager/entry.h branches/sm/tagmanager/fortran.c branches/sm/tagmanager/get.c branches/sm/tagmanager/get.h branches/sm/tagmanager/include/tm_tag.h branches/sm/tagmanager/js.c branches/sm/tagmanager/lregex.c branches/sm/tagmanager/makefile.win32 branches/sm/tagmanager/parse.c branches/sm/tagmanager/read.c branches/sm/tagmanager/read.h branches/sm/tagmanager/sort.c branches/sm/tagmanager/sql.c branches/sm/tagmanager/strlist.c branches/sm/tagmanager/tm_project.c branches/sm/tagmanager/tm_source_file.c branches/sm/tagmanager/tm_tag.c branches/sm/tagmanager/tm_workspace.c branches/sm/wscript Added Paths: ----------- branches/sm/tagmanager/mio/ branches/sm/tagmanager/mio/COPYING branches/sm/tagmanager/mio/Makefile.am branches/sm/tagmanager/mio/README branches/sm/tagmanager/mio/makefile.win32 branches/sm/tagmanager/mio/mio-file.c branches/sm/tagmanager/mio/mio-memory.c branches/sm/tagmanager/mio/mio.c branches/sm/tagmanager/mio/mio.h Modified: branches/sm/AUTHORS =================================================================== --- branches/sm/AUTHORS 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/AUTHORS 2011-05-21 08:44:31 UTC (rev 5801) @@ -2,6 +2,7 @@ ----------- Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +Colomban Wendling <lists(dot)ban(at)herbesfolles(dot)org> Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: branches/sm/COMMITTERS =================================================================== --- branches/sm/COMMITTERS 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/COMMITTERS 2011-05-21 08:44:31 UTC (rev 5801) @@ -3,6 +3,7 @@ Enrico Tröger eht16 Maintainer Nick Treleaven ntrel Maintainer Frank Lanitz frlan Translation Maintainer (I18N/L10N) +Colomban Wendling colombanw Developer Lex Trotman elextr Developer Dominic Hopf dmaphy Developer Eugene Arshinov statc Developer Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/ChangeLog 2011-05-21 08:44:31 UTC (rev 5801) @@ -1,3 +1,33 @@ +2011-03-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/saveactions.c: + Fix wrong warning on empty backup directory setting if + 'Backup Copy' is not enabled at all. + * AUTHORS, src/about.c, README.Packagers, README: + Welcome Colomban Wendling, a new Geany developer. + + +2011-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c: + Fix segfault when inserting e.g. fileheader template when the + template file is empty (#3070913, thanks to lphilpot). + + +2011-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/filebrowser.c: + Add support for multiple file filters, separated by semicolon + (based on a patch by Grigory Javadyan, thanks). + + +2011-02-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * data/filetype_extensions.conf: + Fix detecting Matlab and Txt2Tags extensions by default (#3167315, + #3154637). + + 2011-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * tagmanager/latex.c: Modified: branches/sm/README =================================================================== --- branches/sm/README 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/README 2011-05-21 08:44:31 UTC (rev 5801) @@ -102,7 +102,8 @@ -- -2005-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2005-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com +lists(dot)ban(at)herbesfolles(dot)org frank(at)frank(dot)uvena(dot)de Modified: branches/sm/README.Packagers =================================================================== --- branches/sm/README.Packagers 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/README.Packagers 2011-05-21 08:44:31 UTC (rev 5801) @@ -82,7 +82,8 @@ -- -2008-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2008-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com +lists(dot)ban(at)herbesfolles(dot)org frank(at)frank(dot)uvena(dot)de Modified: branches/sm/configure.ac =================================================================== --- branches/sm/configure.ac 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/configure.ac 2011-05-21 08:44:31 UTC (rev 5801) @@ -313,6 +313,7 @@ icons/scalable/Makefile tagmanager/Makefile tagmanager/include/Makefile +tagmanager/mio/Makefile scintilla/Makefile scintilla/include/Makefile src/Makefile Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:44:31 UTC (rev 5801) @@ -34,7 +34,7 @@ Lisp=*.lisp; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; -Matlab=*.m; +Matlab/Octave=*.m; NSIS=*.nsi;*.nsh; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; @@ -47,7 +47,7 @@ Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; -txt2tags=*.t2t; +Txt2tags=*.t2t; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; Modified: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/geany.glade 2011-05-21 08:44:31 UTC (rev 5801) @@ -6640,7 +6640,7 @@ <child> <widget class="GtkTable" id="table14"> <property name="visible">True</property> - <property name="n_rows">3</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -6795,6 +6795,56 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label250"> + <property name="visible">True</property> + <property name="label" translatable="yes">Symbol list update frequency:</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">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_symbol_update_freq"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates.</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">250 0 10000 10 100 0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: branches/sm/makefile.win32 =================================================================== --- branches/sm/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801) @@ -22,6 +22,7 @@ # Note: && is needed after cd because each line is executed in a different # shell. (cd .. is just for clarity). all: check-tools config.h + cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\.. cd tagmanager && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd .. @@ -37,13 +38,14 @@ $(CP) $< $@ deps: - -$(RM) tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak + -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak # used by src/makefile.win32 to avoid del ../file which is an error clean-local: -$(RM) geany_private.res geany.exe clean: deps + cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\.. cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd .. Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -80,7 +80,7 @@ static gchar *current_dir = NULL; /* in locale-encoding */ static gchar *open_cmd; /* in locale-encoding */ static gchar *config_file; -static gchar *filter = NULL; +static gchar **filter = NULL; static gint page_number = 0; @@ -158,14 +158,21 @@ /* Returns: whether filename should be removed. */ static gboolean check_filtered(const gchar *base_name) { + gchar **filter_item; + guint len; + if (filter == NULL) return FALSE; - - if (! utils_str_equal(base_name, "*") && ! g_pattern_match_simple(filter, base_name)) + + len = g_strv_length(filter); + foreach_c_array(filter_item, filter, len) { - return TRUE; + if (utils_str_equal(base_name, "*") || g_pattern_match_simple(*filter_item, base_name)) + { + return FALSE; + } } - return FALSE; + return TRUE; } @@ -728,9 +735,19 @@ } +static void clear_filter(void) +{ + if (filter != NULL) + { + g_strfreev(filter); + filter = NULL; + } +} + + static void on_clear_filter(GtkEntry *entry, gpointer user_data) { - setptr(filter, NULL); + clear_filter(); gtk_entry_set_text(GTK_ENTRY(filter_entry), ""); @@ -777,13 +794,11 @@ static void on_filter_activate(GtkEntry *entry, gpointer user_data) { - setptr(filter, g_strdup(gtk_entry_get_text(entry))); - - if (! NZV(filter)) + filter = g_strsplit(gtk_entry_get_text(entry), ";", -1); + if (filter == NULL || g_strv_length(filter) == 0) { - setptr(filter, g_strdup("*")); + clear_filter(); } - refresh(); } @@ -791,8 +806,7 @@ static void on_filter_clear(GtkEntry *entry, gint icon_pos, GdkEvent *event, gpointer data) { - setptr(filter, g_strdup("*")); - + clear_filter(); refresh(); } @@ -896,7 +910,7 @@ g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); } ui_widget_set_tooltip_text(filter_entry, - _("Filter your files with usual wildcards")); + _("Filter your files with usual wildcards, separate multiple filters with \";\"")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); @@ -1080,7 +1094,7 @@ GtkWidget *scrollwin, *toolbar, *filterbar; filter = NULL; - + file_view_vbox = gtk_vbox_new(FALSE, 0); toolbar = make_toolbar(); gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0); @@ -1252,7 +1266,7 @@ g_free(config_file); g_free(open_cmd); - g_free(filter); + clear_filter(); gtk_widget_destroy(file_view_vbox); g_object_unref(G_OBJECT(entry_completion)); } Modified: branches/sm/plugins/saveactions.c =================================================================== --- branches/sm/plugins/saveactions.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/plugins/saveactions.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -453,15 +453,18 @@ g_key_file_set_integer(config, "backupcopy", "dir_levels", backupcopy_dir_levels); g_key_file_set_string(config, "backupcopy", "time_fmt", text_time); setptr(backupcopy_time_fmt, g_strdup(text_time)); - if (*text_dir != '\0' && backupcopy_set_backup_dir(text_dir)) + if (enable_backupcopy) { - g_key_file_set_string(config, "backupcopy", "backup_dir", text_dir); + if (NZV(text_dir) && backupcopy_set_backup_dir(text_dir)) + { + g_key_file_set_string(config, "backupcopy", "backup_dir", text_dir); + } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Backup directory does not exist or is not writable.")); + } } - else - { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - _("Backup directory does not exist or is not writable.")); - } if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) Modified: branches/sm/src/Makefile.am =================================================================== --- branches/sm/src/Makefile.am 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801) @@ -75,7 +75,7 @@ INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - @GTK_CFLAGS@ @GIO_CFLAGS@ + -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GIO_CFLAGS@ # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -86,8 +86,8 @@ geany_SOURCES = $(SRCS) win32.c win32.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ \ - $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ + @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ -DGEANY_DOCDIR=\"\" \ @@ -113,7 +113,8 @@ geany_SOURCES = $(SRCS) vte.c vte.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ @SM_LIBS@ $(INTLLIBS) +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ + @GTK_LIBS@ @GIO_LIBS@ @SM_LIBS@ $(INTLLIBS) AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ -DGEANY_DOCDIR=\""$(docdir)"\" \ Modified: branches/sm/src/about.c =================================================================== --- branches/sm/src/about.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/about.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -40,7 +40,7 @@ #define INFO "<span size=\"larger\" weight=\"bold\">%s</span>" #define CODENAME "<span weight=\"bold\">\"" GEANY_CODENAME "\"</span>" #define BUILDDATE "<span size=\"smaller\">%s</span>" -#define COPYRIGHT "Copyright (c) 2005-2011\nNick Treleaven\nEnrico Tröger\nFrank Lanitz\nAll rights reserved." +#define COPYRIGHT "Copyright (c) 2005-2011\nNick Treleaven\nColomban Wendling\nEnrico Tröger\nFrank Lanitz\nAll rights reserved." const gchar *translators[][2] = { { "ast", "Marcos Costales <marcoscostales(a)gmail.com>"}, @@ -264,7 +264,7 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(credits_scrollwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - table = gtk_table_new(18 + translators_len + prev_translators_len, 3, FALSE); + table = gtk_table_new(20 + translators_len + prev_translators_len, 3, FALSE); gtk_table_set_col_spacings(GTK_TABLE(table), 10); row = 0; @@ -286,6 +286,14 @@ ROW("", row, 0, 0, 0, 0); row++; + g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("developer")); + ROW(buffer, row, 0, 0, 0, 1); + row++; + ROW("<lists.ban(a)herbesfolles.org>", row, 0, 0, 0, 1); + row++; + ROW("", row, 0, 0, 0, 0); + row++; + g_snprintf(buffer, sizeof(buffer), "Enrico Tröger - %s", _("developer")); ROW(buffer, row, 0, 0, 0, 1); row++; @@ -295,7 +303,7 @@ row++; g_snprintf(buffer, sizeof(buffer), "Frank Lanitz - %s", _("translation maintainer")); - ROW(buffer, 7, 0, 0, 0, 1); + ROW(buffer, row, 0, 0, 0, 1); row++; ROW("<frank(a)frank.uvena.de>", row, 0, 0, 0, 1); row++; Modified: branches/sm/src/document.c =================================================================== --- branches/sm/src/document.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/document.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -2362,7 +2362,7 @@ static gboolean update_tags_from_buffer(GeanyDocument *doc) { gboolean result; -#if 1 +#if 0 /* old code */ result = tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE); #else Modified: branches/sm/src/editor.c =================================================================== --- branches/sm/src/editor.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/editor.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -83,6 +83,9 @@ /* holds word under the mouse or keyboard cursor */ static gchar current_word[GEANY_MAX_WORD_LENGTH]; +/* whether there is a tag list update pending */ +static gboolean document_tags_update_pending = FALSE; + /* Initialised in keyfile.c. */ GeanyEditorPrefs editor_prefs; @@ -991,6 +994,29 @@ } +static gboolean on_document_update_tags_idle(gpointer data) +{ + GeanyDocument *doc = data; + + if (!main_status.quitting && DOC_VALID(doc)) + document_update_tag_list(doc, TRUE); + + document_tags_update_pending = FALSE; + return FALSE; +} + + +static void request_tag_list_update(GeanyDocument *doc) +{ + if (!document_tags_update_pending) + { + document_tags_update_pending = TRUE; + g_timeout_add_full(G_PRIORITY_LOW, editor_prefs.autocompletion_update_freq, + on_document_update_tags_idle, doc, NULL); + } +} + + static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *editor, SCNotification *nt, G_GNUC_UNUSED gpointer data) { @@ -1052,6 +1078,12 @@ /* handle special fold cases, e.g. #1923350 */ fold_changed(sci, nt->line, nt->foldLevelNow, nt->foldLevelPrev); } + if (editor_prefs.autocompletion_update_freq > 0 && + (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) && + filetype_has_tags(doc->file_type)) + { + request_tag_list_update(doc); + } break; case SCN_CHARADDED: Modified: branches/sm/src/editor.h =================================================================== --- branches/sm/src/editor.h 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/editor.h 2011-05-21 08:44:31 UTC (rev 5801) @@ -146,6 +146,7 @@ gint show_virtual_space; /* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ gboolean long_line_enabled; + gint autocompletion_update_freq; } GeanyEditorPrefs; Modified: branches/sm/src/interface.c =================================================================== --- branches/sm/src/interface.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/interface.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -2712,6 +2712,9 @@ GtkWidget *spin_symbollistheight; GtkObject *spin_autocompletion_max_entries_adj; GtkWidget *spin_autocompletion_max_entries; + GtkWidget *label250; + GtkObject *spin_symbol_update_freq_adj; + GtkWidget *spin_symbol_update_freq; GtkWidget *label177; GtkWidget *frame38; GtkWidget *alignment42; @@ -3985,7 +3988,7 @@ gtk_widget_show (check_completion_drops_rest_of_word); gtk_box_pack_start (GTK_BOX (vbox19), check_completion_drops_rest_of_word, FALSE, FALSE, 0); - table14 = gtk_table_new (3, 2, FALSE); + table14 = gtk_table_new (4, 2, FALSE); gtk_widget_show (table14); gtk_box_pack_start (GTK_BOX (vbox19), table14, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table14), 3); @@ -4039,6 +4042,22 @@ gtk_tooltips_set_tip (tooltips, spin_autocompletion_max_entries, _("Maximum number of entries to display in the autocompletion list"), NULL); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocompletion_max_entries), TRUE); + label250 = gtk_label_new (_("Symbol list update frequency:")); + gtk_widget_show (label250); + gtk_table_attach (GTK_TABLE (table14), label250, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label250), 0, 0.5); + + spin_symbol_update_freq_adj = gtk_adjustment_new (250, 0, 10000, 10, 100, 0); + spin_symbol_update_freq = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbol_update_freq_adj), 1, 0); + gtk_widget_show (spin_symbol_update_freq); + gtk_table_attach (GTK_TABLE (table14), spin_symbol_update_freq, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_symbol_update_freq, _("Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates."), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbol_update_freq), TRUE); + label177 = gtk_label_new (_("<b>Completions</b>")); gtk_widget_show (label177); gtk_frame_set_label_widget (GTK_FRAME (frame18), label177); @@ -5229,6 +5248,8 @@ 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, label250, "label250"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbol_update_freq, "spin_symbol_update_freq"); GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame38, "frame38"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment42, "alignment42"); Modified: branches/sm/src/keyfile.c =================================================================== --- branches/sm/src/keyfile.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/keyfile.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -83,6 +83,7 @@ #define GEANY_DEFAULT_FONT_EDITOR "Monospace 10" #define GEANY_TOGGLE_MARK "~ " #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 +#define GEANY_MAX_SYMBOLS_UPDATE_FREQ 250 static gchar *scribble_text = NULL; @@ -165,6 +166,8 @@ stash_group_add_spin_button_integer(group, (gint*)&editor_prefs.autocompletion_max_entries, "autocompletion_max_entries", GEANY_MAX_AUTOCOMPLETE_WORDS, "spin_autocompletion_max_entries"); + stash_group_add_spin_button_integer(group, (gint*)&editor_prefs.autocompletion_update_freq, + "autocompletion_update_freq", GEANY_MAX_SYMBOLS_UPDATE_FREQ, "spin_symbol_update_freq"); stash_group_add_string(group, &editor_prefs.color_scheme, "color_scheme", NULL); Modified: branches/sm/src/makefile.win32 =================================================================== --- branches/sm/src/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801) @@ -32,6 +32,7 @@ INCLUDEDIRS= -I.. \ -I../scintilla/include \ + -I../tagmanager/mio \ -I../tagmanager/include \ $(GTK_INCLUDES) @@ -92,8 +93,8 @@ $(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ - ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \ - $(WIN_LIBS) + ../scintilla/scintilla.a ../tagmanager/mio∕mio.a ../tagmanager/tagmanager.a \ + $(ALL_GTK_LIBS) $(WIN_LIBS) deps.mak: $(CC) -MM $(CFLAGS) *.c >deps.mak Modified: branches/sm/src/sciwrappers.c =================================================================== --- branches/sm/src/sciwrappers.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/sciwrappers.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -450,6 +450,9 @@ } +/** Gets the position at the end of a line + * @param sci Scintilla widget + * @param line Line */ gint sci_get_line_end_position(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINEENDPOSITION, line, 0); @@ -823,6 +826,10 @@ } +/** Sets the font for a particular style + * @param style The style + * @param font The font name + * @param size The font size */ void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, gint size) { SSM(sci, SCI_STYLESETFONT, style, (sptr_t) font); Modified: branches/sm/src/sidebar.c =================================================================== --- branches/sm/src/sidebar.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/sidebar.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -216,7 +216,7 @@ if (doc->priv->tag_tree == NULL) { doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING); doc->priv->tag_tree = gtk_tree_view_new(); prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); gtk_widget_show(doc->priv->tag_tree); @@ -874,6 +874,7 @@ change_focus_to_editor(doc, NULL); } } + tm_tag_unref(tag); } return FALSE; } Modified: branches/sm/src/symbols.c =================================================================== --- branches/sm/src/symbols.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/symbols.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -900,30 +900,21 @@ } -/* the following code surely can be improved, at the moment it collects some iters - * for removal and after that the actual removal is done. I didn't find a way to find and remove - * an empty row in one loop (next iter fails then) */ +/* removes toplevel items that have no children */ static void hide_empty_rows(GtkTreeStore *store) { - GtkTreeIter iter, *iters[MAX_SYMBOL_TYPES] = { NULL }; - guint i = 0; + GtkTreeIter iter; + gboolean cont = TRUE; if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) return; /* stop when first iter is invalid, i.e. no elements */ - do /* first collect the iters we need to delete empty rows */ + while (cont) { if (! gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) - iters[i++] = gtk_tree_iter_copy(&iter); - } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter)); - - /* now actually delete the collected iters */ - for (i = 0; i < MAX_SYMBOL_TYPES; i++) - { - if (G_UNLIKELY(iters[i] == NULL)) - break; - gtk_tree_store_remove(store, iters[i]); - gtk_tree_iter_free(iters[i]); + cont = gtk_tree_store_remove(store, &iter); + else + cont = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); } } @@ -1233,7 +1224,8 @@ gpointer user_data) { gboolean sort_by_name = GPOINTER_TO_INT(user_data); - const TMTag *tag_a, *tag_b; + TMTag *tag_a, *tag_b; + gint cmp; gtk_tree_model_get(model, a, SYMBOLS_COLUMN_TAG, &tag_a, -1); gtk_tree_model_get(model, b, SYMBOLS_COLUMN_TAG, &tag_b, -1); @@ -1243,13 +1235,12 @@ if (tag_a && !tag_has_missing_parent(tag_a, GTK_TREE_STORE(model), a) && tag_b && !tag_has_missing_parent(tag_b, GTK_TREE_STORE(model), b)) { - return sort_by_name ? compare_symbol(tag_a, tag_b) : + cmp = sort_by_name ? compare_symbol(tag_a, tag_b) : compare_symbol_lines(tag_a, tag_b); } else { gchar *astr, *bstr; - gint cmp; gtk_tree_model_get(model, a, SYMBOLS_COLUMN_NAME, &astr, -1); gtk_tree_model_get(model, b, SYMBOLS_COLUMN_NAME, &bstr, -1); @@ -1263,23 +1254,28 @@ { /* this is what g_strcmp0() does */ if (! astr) - return -(astr != bstr); + cmp = -(astr != bstr); if (! bstr) - return astr != bstr; + cmp = astr != bstr; + else + { + cmp = strcmp(astr, bstr); - cmp = strcmp(astr, bstr); - - /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ - if (tag_a && tag_b) - if (!sort_by_name || - (utils_str_equal(tag_a->name, tag_b->name) && - utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) - cmp = compare_symbol_lines(tag_a, tag_b); + /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ + if (tag_a && tag_b) + if (!sort_by_name || + (utils_str_equal(tag_a->name, tag_b->name) && + utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) + cmp = compare_symbol_lines(tag_a, tag_b); + } } g_free(astr); g_free(bstr); - return cmp; } + tm_tag_unref(tag_a); + tm_tag_unref(tag_b); + + return cmp; } Modified: branches/sm/src/templates.c =================================================================== --- branches/sm/src/templates.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/src/templates.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -508,12 +508,15 @@ /* add line_prefix to every line of comment_text */ lines = g_strsplit(comment_text->str, template_eol_char, -1); - len = g_strv_length(lines) - 1; - for (i = 0; i < len; i++) + len = g_strv_length(lines); + if (len > 0) /* prevent unsigned wraparound if comment_text is empty */ { - tmp = lines[i]; - lines[i] = g_strconcat(prefix, tmp, NULL); - g_free(tmp); + for (i = 0; i < len - 1; i++) + { + tmp = lines[i]; + lines[i] = g_strconcat(prefix, tmp, NULL); + g_free(tmp); + } } tmp = g_strjoinv(template_eol_char, lines); Modified: branches/sm/tagmanager/Makefile.am =================================================================== --- branches/sm/tagmanager/Makefile.am 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801) @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in # $Id$ -SUBDIRS = include -INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) +SUBDIRS = mio include +INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir) AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\" Modified: branches/sm/tagmanager/c.c =================================================================== --- branches/sm/tagmanager/c.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/c.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -16,6 +16,7 @@ #include <string.h> #include <setjmp.h> +#include <mio/mio.h> #include "entry.h" #include "get.h" @@ -180,8 +181,7 @@ keywordId keyword; vString* name; /* the name of the token */ unsigned long lineNumber; /* line number of tag */ - fpos_t filePosition; /* file position of line containing name */ - int bufferPosition; /* buffer position of line containing name */ + MIOPos filePosition; /* file position of line containing name */ } tokenInfo; typedef enum eImplementation @@ -602,10 +602,7 @@ token->type = TOKEN_NONE; token->keyword = KEYWORD_NONE; token->lineNumber = getSourceLineNumber(); - if (useFile()) - token->filePosition = getInputFilePosition(); - else - token->bufferPosition = getInputBufferPosition(); + token->filePosition = getInputFilePosition(); vStringClear(token->name); } @@ -1236,16 +1233,8 @@ if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - if (useFile()) - { - tag->extensionFields.arglist = getArglistFromFilePos( + tag->extensionFields.arglist = getArglistFromFilePos( tag->filePosition, tag->name); - } - else - { - tag->extensionFields.arglist = getArglistFromBufferPos( - tag->bufferPosition, tag->name); - } } break; } @@ -1424,10 +1413,7 @@ initTagEntry (&e, vStringValue (token->name)); e.lineNumber = token->lineNumber; - if (useFile()) - e.filePosition = token->filePosition; - else - e.bufferPosition = token->bufferPosition; + e.filePosition = token->filePosition; e.isFileScope = isFileScope; e.kindName = tagName (type); e.kind = tagLetter (type); @@ -1894,10 +1880,7 @@ { dest->type = src->type; dest->keyword = src->keyword; - if (useFile()) - dest->filePosition = src->filePosition; - else - dest->bufferPosition = src->bufferPosition; + dest->filePosition = src->filePosition; dest->lineNumber = src->lineNumber; vStringCopy (dest->name, src->name); } @@ -2487,12 +2470,7 @@ } if (st->argEndPosition == 0) { - if (useFile()) - st->argEndPosition = ftell(File.fp); - else - /* FIXME File.fpBufferPosition is wrong here, this breaks function signatures and - * so Geany's calltips */ - st->argEndPosition = File.fpBufferPosition; + st->argEndPosition = mio_tell(File.mio); } if (! info->isNameCandidate) Modified: branches/sm/tagmanager/entry.c =================================================================== --- branches/sm/tagmanager/entry.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/entry.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -127,8 +127,8 @@ const char *const fileName, const char *const pattern) { - const int length = fprintf (TagFile.fp, "%s%s\t%s\t/%s/\n", - PSEUDO_TAG_PREFIX, tagName, fileName, pattern); + const int length = mio_printf (TagFile.mio, "%s%s\t%s\t/%s/\n", + PSEUDO_TAG_PREFIX, tagName, fileName, pattern); ++TagFile.numTags.added; rememberMaxLengths (strlen (tagName), (size_t) length); } @@ -159,7 +159,7 @@ } static void updateSortedFlag (const char *const line, - FILE *const fp, fpos_t startOfLine) + MIO *const mio, MIOPos startOfLine) { const char *const tab = strchr (line, '\t'); @@ -169,27 +169,27 @@ if (line [boolOffset] == '0' || line [boolOffset] == '1') { - fpos_t nextLine; + MIOPos nextLine; - if (fgetpos (fp, &nextLine) == -1 || fsetpos (fp, &startOfLine) == -1) + if (mio_getpos (mio, &nextLine) == -1 || mio_setpos (mio, &startOfLine) == -1) error (WARNING, "Failed to update 'sorted' pseudo-tag"); else { - fpos_t flagLocation; + MIOPos flagLocation; int c, d; do - c = fgetc (fp); + c = mio_getc (mio); while (c != '\t' && c != '\n'); - fgetpos (fp, &flagLocation); - d = fgetc (fp); + mio_getpos (mio, &flagLocation); + d = mio_getc (mio); if (c == '\t' && (d == '0' || d == '1') && d != (int) Option.sorted) { - fsetpos (fp, &flagLocation); - fputc (Option.sorted ? '1' : '0', fp); + mio_setpos (mio, &flagLocation); + mio_putc (mio, Option.sorted ? '1' : '0'); } - fsetpos (fp, &nextLine); + mio_setpos (mio, &nextLine); } } } @@ -198,12 +198,12 @@ /* Look through all line beginning with "!_TAG_FILE", and update those which * require it. */ -static long unsigned int updatePseudoTags (FILE *const fp) +static long unsigned int updatePseudoTags (MIO *const mio) { enum { maxClassLength = 20 }; char class [maxClassLength + 1]; unsigned long linesRead = 0; - fpos_t startOfLine; + MIOPos startOfLine; size_t classLength; const char *line; @@ -211,8 +211,8 @@ classLength = strlen (class); Assert (classLength < maxClassLength); - fgetpos (fp, &startOfLine); - line = readLine (TagFile.vLine, fp); + mio_getpos (mio, &startOfLine); + line = readLine (TagFile.vLine, mio); while (line != NULL && line [0] == class [0]) { ++linesRead; @@ -224,16 +224,16 @@ tab == '\t') { if (strcmp (classType, "_SORTED") == 0) - updateSortedFlag (line, fp, startOfLine); + updateSortedFlag (line, mio, startOfLine); } - fgetpos (fp, &startOfLine); + mio_getpos (mio, &startOfLine); } - line = readLine (TagFile.vLine, fp); + line = readLine (TagFile.vLine, mio); } while (line != NULL) /* skip to end of file */ { ++linesRead; - line = readLine (TagFile.vLine, fp); + line = readLine (TagFile.vLine, mio); } return linesRead; } @@ -247,22 +247,22 @@ static boolean isTagFile (const char *const filename) { boolean ok = FALSE; /* we assume not unless confirmed */ - FILE *const fp = g_fopen (filename, "rb"); + MIO *const mio = mio_new_file_full (filename, "rb", g_fopen, fclose); - if (fp == NULL && errno == ENOENT) + if (mio == NULL && errno == ENOENT) ok = TRUE; - else if (fp != NULL) + else if (mio != NULL) { - const char *line = readLine (TagFile.vLine, fp); + const char *line = readLine (TagFile.vLine, mio); if (line == NULL) ok = TRUE; - fclose (fp); + mio_free (mio); } return ok; } -extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size) +extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size) { enum { BufferSize = 1000 }; long toRead, numRead; @@ -272,8 +272,8 @@ { toRead = (0 < remaining && remaining < BufferSize) ? remaining : BufferSize; - numRead = fread (buffer, (size_t) 1, (size_t) toRead, fromFp); - if (fwrite (buffer, (size_t)1, (size_t)numRead, toFp) < (size_t)numRead) + numRead = mio_read (fromMio, buffer, (size_t) 1, (size_t) toRead); + if (mio_write (toMio, buffer, (size_t)1, (size_t)numRead) < (size_t)numRead) error (FATAL | PERROR, "cannot complete write"); if (remaining > 0) remaining -= numRead; @@ -283,20 +283,20 @@ extern void copyFile (const char *const from, const char *const to, const long size) { - FILE* const fromFp = g_fopen (from, "rb"); - if (fromFp == NULL) + MIO* const fromMio = mio_new_file_full (from, "rb", g_fopen, fclose); + if (fromMio == NULL) error (FATAL | PERROR, "cannot open file to copy"); else { - FILE* const toFp = g_fopen (to, "wb"); - if (toFp == NULL) + MIO* const toMio = mio_new_file_full (to, "wb", g_fopen, fclose); + if (toMio == NULL) error (FATAL | PERROR, "cannot open copy destination"); else { - copyBytes (fromFp, toFp, size); - fclose (toFp); + copyBytes (fromMio, toMio, size); + mio_free (toMio); } - fclose (fromFp); + mio_free (fromMio); } } @@ -311,7 +311,12 @@ /* Open the tags file. */ if (TagsToStdout) - TagFile.fp = tempFile ("w", &TagFile.name); + { + FILE *fp; + + fp = tempFile ("w", &TagFile.name); + TagFile.mio = mio_new_fp (fp, fclose); + } else { boolean fileExists; @@ -324,24 +329,24 @@ "\"%s\" doesn't look like a tag file; I refuse to overwrite it.", TagFile.name); - if (Option.append && fileExists) - { - TagFile.fp = g_fopen (TagFile.name, "r+"); - if (TagFile.fp != NULL) + if (Option.append && fileExists) { - TagFile.numTags.prev = updatePseudoTags (TagFile.fp); - fclose (TagFile.fp); - TagFile.fp = g_fopen (TagFile.name, "a+"); + TagFile.mio = mio_new_file_full (TagFile.name, "r+", g_fopen, fclose); + if (TagFile.mio != NULL) + { + TagFile.numTags.prev = updatePseudoTags (TagFile.mio); + mio_free (TagFile.mio); + TagFile.mio = mio_new_file_full (TagFile.name, "a+", g_fopen, fclose); + } } - } - else - { - TagFile.fp = g_fopen (TagFile.name, "w"); - if (TagFile.fp != NULL) - addPseudoTags (); - } + else + { + TagFile.mio = mio_new_file_full (TagFile.name, "w", g_fopen, fclose); + if (TagFile.mio != NULL) + addPseudoTags (); + } - if (TagFile.fp == NULL) + if (TagFile.mio == NULL) { error (FATAL | PERROR, "cannot open tag file"); exit (1); @@ -409,7 +414,6 @@ e->lineNumber = getSourceLineNumber (); e->language = getSourceLanguageName (); e->filePosition = getInputFilePosition (); - e->bufferPosition = getInputBufferPosition (); e->sourceFileName = getSourceFileTagPath (); e->name = name; } Modified: branches/sm/tagmanager/entry.h =================================================================== --- branches/sm/tagmanager/entry.h 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/entry.h 2011-05-21 08:44:31 UTC (rev 5801) @@ -15,7 +15,7 @@ */ #include "general.h" /* must always come first */ -#include <stdio.h> +#include <mio/mio.h> #include "vstring.h" @@ -33,12 +33,12 @@ typedef struct eTagFile { char *name; char *directory; - FILE *fp; + MIO *mio; struct sNumTags { unsigned long added, prev; } numTags; struct sMax { size_t line, tag, file; } max; struct sEtags { char *name; - FILE *fp; + MIO *mio; size_t byteCount; } etags; vString *vLine; @@ -55,7 +55,7 @@ typedef struct sTagEntryInfo { boolean lineNumberEntry;/* pattern or line number entry */ unsigned long lineNumber; /* line number of tag */ - fpos_t filePosition; /* file position of line containing tag */ + MIOPos filePosition; /* file position of line containing tag */ int bufferPosition; /* buffer position of line containing tag */ const char* language; /* language of source file */ boolean isFileScope; /* is tag visibile only within source file? */ @@ -88,7 +88,7 @@ */ extern void freeTagFileResources (void); extern const char *tagFileName (void); -extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size); +extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size); extern void copyFile (const char *const from, const char *const to, const long size); extern void openTagFile (void); extern void closeTagFile (const boolean resize); Modified: branches/sm/tagmanager/fortran.c =================================================================== --- branches/sm/tagmanager/fortran.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/fortran.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -19,6 +19,7 @@ #include <limits.h> #include <ctype.h> /* to define tolower () */ #include <setjmp.h> +#include <mio/mio.h> #include "entry.h" #include "keyword.h" @@ -183,8 +184,7 @@ vString* string; struct sTokenInfo *secondary; unsigned long lineNumber; - fpos_t filePosition; - int bufferPosition; /* buffer position of line containing name */ + MIOPos filePosition; } tokenInfo; /* @@ -423,10 +423,7 @@ token->string = vStringNew (); token->secondary = NULL; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); return token; } @@ -480,10 +477,7 @@ e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); e.lineNumber = token->lineNumber; - if (useFile()) - e.filePosition = token->filePosition; - else - e.bufferPosition = token->bufferPosition; + e.filePosition = token->filePosition; e.isFileScope = isFileScope (token->tag); e.kindName = FortranKinds [token->tag].name; e.kind = FortranKinds [token->tag].letter; @@ -959,10 +953,7 @@ c = getChar (); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); switch (c) { Modified: branches/sm/tagmanager/get.c =================================================================== --- branches/sm/tagmanager/get.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/get.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -314,14 +314,8 @@ e.kind = 'd'; if (parameterized) { - if (useFile()) { - e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() - , e.name); - } - else { - e.extensionFields.arglist = getArglistFromBufferPos(getInputBufferPosition() - , e.name); - } + e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() + , e.name); } makeTagEntry (&e); if (parameterized) @@ -715,63 +709,30 @@ return c; } -extern char *getArglistFromBufferPos(int startPosition, const char *tokenName) +extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) { - int bufferOriginalPosition; + MIOPos originalPosition; char *result = NULL; char *arglist = NULL; long pos1, pos2; - /* FIXME startPosition as well as getBufPos() are mostly wrong here */ - pos2 = getBufPos(); + pos2 = mio_tell(File.mio); - if (!useFile()) { - bufferOriginalPosition = getBufPos (); - setBufPos(startPosition); - pos1 = File.fpBufferPosition; - } - else - return NULL; + mio_getpos(File.mio, &originalPosition); + mio_setpos(File.mio, &startPosition); + pos1 = mio_tell(File.mio); if (pos2 > pos1) { result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL) + if (result != NULL && mio_read(File.mio, result, sizeof(char), pos2 - pos1 + 1) > 0) { - memcpy(result, &File.fpBuffer[getBufPos()], pos2 - pos1 + 1); result[pos2-pos1+1] = '\0'; arglist = getArglistFromStr(result, tokenName); - g_free(result); } - } - setBufPos (bufferOriginalPosition); - return arglist; -} - -extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName) -{ - fpos_t originalPosition; - char *result = NULL; - char *arglist = NULL; - long pos1, pos2; - - pos2 = ftell(File.fp); - - fgetpos(File.fp, &originalPosition); - fsetpos(File.fp, &startPosition); - pos1 = ftell(File.fp); - - if (pos2 > pos1) - { - result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL && fread(result, sizeof(char), pos2 - pos1 + 1, File.fp) > 0) - { - result[pos2-pos1+1] = '\0'; - arglist = getArglistFromStr(result, tokenName); - } g_free(result); } - fsetpos(File.fp, &originalPosition); + mio_setpos(File.mio, &originalPosition); return arglist; } Modified: branches/sm/tagmanager/get.h =================================================================== --- branches/sm/tagmanager/get.h 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/get.h 2011-05-21 08:44:31 UTC (rev 5801) @@ -45,8 +45,7 @@ extern void cppUngetc (const int c); extern int cppGetc (void); extern int skipOverCComment (void); -extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName); -extern char *getArglistFromBufferPos(int startPosition, const char *tokenName); +extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName); extern char *getArglistFromStr(char *buf, const char *name); #endif /* _GET_H */ Modified: branches/sm/tagmanager/include/tm_tag.h =================================================================== --- branches/sm/tagmanager/include/tm_tag.h 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/include/tm_tag.h 2011-05-21 08:44:31 UTC (rev 5801) @@ -30,6 +30,7 @@ */ #include "tm_source_file.h" +#include <glib-object.h> #ifdef __cplusplus extern "C" @@ -147,6 +148,7 @@ gboolean inactive; /*!< Whether this file is to be parsed */ } file; } atts; + gint refcount; /*!< the reference count of the tag */ } TMTag; /*! @@ -158,6 +160,12 @@ */ typedef int (*TMTagCompareFunc) (const void *ptr1, const void *ptr2); +/*! The GType for a TMTag */ +#define TM_TYPE_TAG (tm_tag_get_type()) + +/*! Gets the GType for a TMTag */ +GType tm_tag_get_type(void) G_GNUC_CONST; + /*! Initializes a TMTag structure with information from a tagEntryInfo struct used by the ctags parsers. Note that the TMTag structure must be malloc()ed @@ -306,15 +314,29 @@ \sa tm_tag_free() */ void tm_tag_destroy(TMTag *tag); -#endif /*! Destroys all data in the tag and frees the tag structure as well. \param tag Pointer to a TMTag structure */ void tm_tag_free(gpointer tag); +#endif /*! + Drops a reference from a TMTag. If the reference count reaches 0, this function + destroys all data in the tag and frees the tag structure as well. + \param tag Pointer to a TMTag structure +*/ +void tm_tag_unref(TMTag *tag); + +/*! + Adds a reference to a TMTag. + \param tag Pointer to a TMTag structure + \return the passed-in TMTag +*/ +TMTag *tm_tag_ref(TMTag *tag); + +/*! Returns the type of tag as a string \param tag The tag whose type is required */ Modified: branches/sm/tagmanager/js.c =================================================================== --- branches/sm/tagmanager/js.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/js.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -21,6 +21,7 @@ #include "general.h" /* must always come first */ #include <ctype.h> /* to define isalpha () */ #include <setjmp.h> +#include <mio/mio.h> #ifdef DEBUG #include <stdio.h> #endif @@ -107,10 +108,9 @@ vString * string; vString * scope; unsigned long lineNumber; - fpos_t filePosition; + MIOPos filePosition; int nestLevel; boolean ignoreTag; - int bufferPosition; /* buffer position of line containing name */ } tokenInfo; /* @@ -198,10 +198,7 @@ token->nestLevel = 0; token->ignoreTag = FALSE; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); return token; } @@ -357,11 +354,8 @@ { c = fileGetc (); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); - } + token->filePosition = getInputFilePosition (); + } while (c == '\t' || c == ' ' || c == '\n'); switch (c) @@ -384,10 +378,7 @@ token->type = TOKEN_STRING; parseString (token->string, c); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); break; case '\\': @@ -396,10 +387,7 @@ fileUngetc (c); token->type = TOKEN_CHARACTER; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); break; case '/': @@ -442,10 +430,7 @@ { parseIdentifier (token->string, c); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); token->keyword = analyzeToken (token->string); if (isKeyword (token, KEYWORD_NONE)) token->type = TOKEN_IDENTIFIER; @@ -460,10 +445,7 @@ { dest->nestLevel = src->nestLevel; dest->lineNumber = src->lineNumber; - if (useFile()) - dest->filePosition = src->filePosition; - else - dest->bufferPosition = src->bufferPosition; + dest->filePosition = src->filePosition; dest->type = src->type; dest->keyword = src->keyword; vStringCopy(dest->string, src->string); Modified: branches/sm/tagmanager/lregex.c =================================================================== --- branches/sm/tagmanager/lregex.c 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/lregex.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -20,6 +20,7 @@ #include <string.h> #include <glib.h> +#include <mio/mio.h> #ifdef HAVE_REGCOMP # include <ctype.h> @@ -410,15 +411,15 @@ else { const char* regexfile = parameter + 1; - FILE* const fp = fopen (regexfile, "r"); - if (fp == NULL) + MIO* const mio = mio_new_file (regexfile, "r"); + if (mio == NULL) printf ("regex: %s\n", regexfile); else { vString* const regex = vStringNew (); - while (readLine (regex, fp)) + while (readLine (regex, mio)) addLanguageRegex (language, vStringValue (regex)); - fclose (fp); + mio_free (mio); vStringDelete (regex); } } Modified: branches/sm/tagmanager/makefile.win32 =================================================================== --- branches/sm/tagmanager/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800) +++ branches/sm/tagmanager/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801) @@ -22,7 +22,7 @@ -I$(PREFIX)/include/gettext \ -I$(PREFIX)/include -INCLUDEDIRS=-I include $(GTK_INCLUDES) +INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES) CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) ifdef DEBUG Added: branches/sm/tagmanager/mio/COPYING =================================================================== --- branches/sm/tagmanager/mio/COPYING (rev 0) +++ branches/sm/tagmanager/mio/COPYING 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Added: branches/sm/tagmanager/mio/Makefile.am =================================================================== --- branches/sm/tagmanager/mio/Makefile.am (rev 0) +++ branches/sm/tagmanager/mio/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,13 @@ +# $id$ + +noinst_LIBRARIES = libmio.a + +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG +AM_CFLAGS = $(GTK_CFLAGS) + +libmio_a_SOURCES = mio.c + +EXTRA_DIST = \ + mio.h \ + mio-file.c + mio-memory.c Added: branches/sm/tagmanager/mio/README =================================================================== --- branches/sm/tagmanager/mio/README (rev 0) +++ branches/sm/tagmanager/mio/README 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,3 @@ +These files are from the MIO library, http://gitorious.org/mio + +See COPYING for the MIO license. Copied: branches/sm/tagmanager/mio/makefile.win32 (from rev 5800, branches/sm/tagmanager/makefile.win32) =================================================================== --- branches/sm/tagmanager/mio/makefile.win32 (rev 0) +++ branches/sm/tagmanager/mio/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,48 @@ + +.SUFFIXES: .cxx .c .o .h .a +CC = gcc +AR = ar +RANLIB = ranlib +PREFIX = C:\libs +RM = del +-include ../../localwin32.mk + +COMPLIB=mio.a + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include + +INCLUDEDIRS=-I include $(GTK_INCLUDES) + +CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) +ifdef DEBUG +CFLAGS= -O0 -g $(CBASEFLAGS) +else +CFLAGS=-O2 $(CBASEFLAGS) +endif + +.c.o: + $(CC) $(CFLAGS) -w -c $< + +all: $(COMPLIB) + +clean: + -$(RM) deps.mak *.o $(COMPLIB) + +$(COMPLIB): mio.o + $(AR) rc $@ $^ + $(RANLIB) $@ + +deps.mak: + $(CC) -MM $(CFLAGS) *.c >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak Added: branches/sm/tagmanager/mio/mio-file.c =================================================================== --- branches/sm/tagmanager/mio/mio-file.c (rev 0) +++ branches/sm/tagmanager/mio/mio-file.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,174 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* file IO implementation */ + +#include <glib.h> +#include <stdarg.h> +#include <stdio.h> +#include <errno.h> + +#include "mio.h" + + +#define FILE_SET_VTABLE(mio) \ + G_STMT_START { \ + mio->v_free = file_free; \ + mio->v_read = file_read; \ + mio->v_write = file_write; \ + mio->v_getc = file_getc; \ + mio->v_gets = file_gets; \ + mio->v_ungetc = file_ungetc; \ + mio->v_putc = file_putc; \ + mio->v_puts = file_puts; \ + mio->v_vprintf = file_vprintf; \ + mio->v_clearerr = file_clearerr; \ + mio->v_eof = file_eof; \ + mio->v_error = file_error; \ + mio->v_seek = file_seek; \ + mio->v_tell = file_tell; \ + mio->v_rewind = file_rewind; \ + mio->v_getpos = file_getpos; \ + mio->v_setpos = file_setpos; \ + } G_STMT_END + + +static void +file_free (MIO *mio) +{ + if (mio->impl.file.close_func) { + mio->impl.file.close_func (mio->impl.file.fp); + } + mio->impl.file.close_func = NULL; + mio->impl.file.fp = NULL; +} + +static gsize +file_read (MIO *mio, + void *ptr, + gsize size, + gsize nmemb) +{ + return fread (ptr, size, nmemb, mio->impl.file.fp); +} + +static gsize +file_write (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb) +{ + return fwrite (ptr, size, nmemb, mio->impl.file.fp); +} + +static gint +file_putc (MIO *mio, + gint c) +{ + return fputc (c, mio->impl.file.fp); +} + +static gint +file_puts (MIO *mio, + const gchar *s) +{ + return fputs (s, mio->impl.file.fp); +} + +static gint +file_vprintf (MIO *mio, + const gchar *format, + va_list ap) +{ + return vfprintf (mio->impl.file.fp, format, ap); +} + +static gint +file_getc (MIO *mio) +{ + return fgetc (mio->impl.file.fp); +} + +static gint +file_ungetc (MIO *mio, + gint ch) +{ + return ungetc (ch, mio->impl.file.fp); +} + +static gchar * +file_gets (MIO *mio, + gchar *s, + gsize size) +{ + return fgets (s, (int)size, mio->impl.file.fp); +} + +static void +file_clearerr (MIO *mio) +{ + clearerr (mio->impl.file.fp); +} + +static gint +file_eof (MIO *mio) +{ + return feof (mio->impl.file.fp); +} + +static gint +file_error (MIO *mio) +{ + return ferror (mio->impl.file.fp); +} + +static gint +file_seek (MIO *mio, + glong offset, + gint whence) +{ + return fseek (mio->impl.file.fp, offset, whence); +} + +static glong +file_tell (MIO *mio) +{ + return ftell (mio->impl.file.fp); +} + +static void +file_rewind (MIO *mio) +{ + rewind (mio->impl.file.fp); +} + +static gint +file_getpos (MIO *mio, + MIOPos *pos) +{ + return fgetpos (mio->impl.file.fp, &pos->impl.file); +} + +static gint +file_setpos (MIO *mio, + MIOPos *pos) +{ + return fsetpos (mio->impl.file.fp, &pos->impl.file); +} Added: branches/sm/tagmanager/mio/mio-memory.c =================================================================== --- branches/sm/tagmanager/mio/mio-memory.c (rev 0) +++ branches/sm/tagmanager/mio/mio-memory.c 2011-05-21 08:44:31 UTC (rev 5801) @@ -0,0 +1,481 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* memory IO implementation */ + +#include <glib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include "mio.h" + + +#define MEM_SET_VTABLE(mio) \ + G_STMT_START { \ + mio->v_free = mem_free; \ + mio->v_read = mem_read; \ + mio->v_write = mem_write; \ + mio->v_getc = mem_getc; \ + mio->v_gets = mem_gets; \ + mio->v_ungetc = mem_ungetc; \ + mio->v_putc = mem_putc; \ + mio->v_puts = mem_puts; \ + mio->v_vprintf = mem_vprintf; \ + mio->v_clearerr = mem_clearerr; \ + mio->v_eof = mem_eof; \ + mio->v_error = mem_error; \ + mio->v_seek = mem_seek; \ + mio->v_tell = mem_tell; \ + mio->v_rewind = mem_rewind; \ + mio->v_getpos = mem_getpos; \ + mio->v_setpos = mem_setpos; \ + } G_STMT_END + + +/* minimal reallocation chunk size */ +#define MIO_CHUNK_SIZE 4096 + + +static void +mem_free (MIO *mio) +{ + if (mio->impl.mem.free_func) { + mio->impl.mem.free_func (mio->impl.mem.buf); + } + mio->impl.mem.buf = NULL; + mio->impl.mem.pos = 0; + mio->impl.mem.size = 0; + mio->impl.mem.allocated_size = 0; + mio->impl.mem.realloc_func = NULL; + mio->impl.mem.free_func = NULL; + mio->impl.mem.eof = FALSE; + mio->impl.mem.error = FALSE; +} + +static gsize +mem_read (MIO *mio, + void *ptr, + gsize size, + gsize nmemb) +{ + gsize n_read = 0; + + if (size != 0 && nmemb != 0) { + if (mio->impl.mem.ungetch != EOF) { + *((guchar *)ptr) = (guchar)mio->impl.mem.ungetch; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos++; + if (size == 1) { + n_read++; + } else if (mio->impl.mem.pos + (size - 1) <= mio->impl.mem.size) { + memcpy (&(((guchar *)ptr)[1]), + &mio->impl.mem.buf[mio->impl.mem.pos], size - 1); + mio->impl.mem.pos += size - 1; + n_read++; + } + } + for (; n_read < nmemb; n_read++) { + if (mio->impl.mem.pos + size > mio->impl.mem.size) { + break; + } else { + memcpy (&(((guchar *)ptr)[n_read * size]), + &mio->impl.mem.buf[mio->impl.mem.pos], size); + mio->impl.mem.pos += size; + } + } + if (mio->impl.mem.pos >= mio->impl.mem.size) { + mio->impl.mem.eof = TRUE; + } + } + + return n_read; +} + +/* + * mem_try_resize: + * @mio: A #MIO object of the type %MIO_TYPE_MEMORY + * @new_size: Requested new size + * + * Tries to resize the underlying buffer of an in-memory #MIO object. + * This supports both growing and shrinking. + * + * Returns: %TRUE on success, %FALSE otherwise. + */ +static gboolean +mem_try_resize (MIO *mio, + gsize new_size) +{ + gboolean success = FALSE; + + if (mio->impl.mem.realloc_func) { + if (G_UNLIKELY (new_size == G_MAXSIZE)) { + #ifdef EOVERFLOW + errno = EOVERFLOW; + #endif + } else { + if (new_size > mio->impl.mem.size) { + if (new_size <= mio->impl.mem.allocated_size) { + mio->impl.mem.size = new_size; + success = TRUE; + } else { + gsize newsize; + guchar *newbuf; + + newsize = MAX (mio->impl.mem.allocated_size + MIO_CHUNK_SIZE, + new_size); + newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, newsize); + if (newbuf) { + mio->impl.mem.buf = newbuf; + mio->impl.mem.allocated_size = newsize; + mio->impl.mem.size = new_size; + success = TRUE; + } + } + } else { + guchar *newbuf; + + newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, new_size); + if (G_LIKELY (newbuf || new_size == 0)) { + mio->impl.mem.buf = newbuf; + mio->impl.mem.allocated_size = new_size; + mio->impl.mem.size = new_size; + success = TRUE; + } + } + } + } + + return success; +} + +/* + * mem_try_ensure_space: + * @mio: A #MIO object + * @n: Requested size from the current (cursor) position + * + * Tries to ensure there is enough space for @n bytes to be written from the + * current cursor position. + * + * Returns: %TRUE if there is enough space, %FALSE otherwise. + */ +static gboolean +mem_try_ensure_space (MIO *mio, + gsize n) +{ + gboolean success = TRUE; + + if (mio->impl.mem.pos + n > mio->impl.mem.size) { + success = mem_try_resize (mio, mio->impl.mem.pos + n); + } + + return success; +} + +static gsize +mem_write (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb) +{ + gsize n_written = 0; + + if (size != 0 && nmemb != 0) { + if (mem_try_ensure_space (mio, size * nmemb)) { + memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], ptr, size * nmemb); + mio->impl.mem.pos += size * nmemb; + n_written = nmemb; + } + } + + return n_written; +} + +static gint +mem_putc (MIO *mio, + gint c) +{ + gint rv = EOF; + + if (mem_try_ensure_space (mio, 1)) { + mio->impl.mem.buf[mio->impl.mem.pos] = (guchar)c; + mio->impl.mem.pos++; + rv = (gint)((guchar)c); + } + + return rv; +} + +static gint +mem_puts (MIO *mio, + const gchar *s) +{ + gint rv = EOF; + gsize len; + + len = strlen (s); + if (mem_try_ensure_space (mio, len)) { + memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], s, len); + mio->impl.mem.pos += len; + rv = 1; + } + + return rv; +} + +static gint +mem_vprintf (MIO *mio, + const gchar *format, + va_list ap) +{ + gint rv = -1; + gint n; + gchar tmp; + gsize old_pos; + gsize old_size; + va_list ap_copy; + + old_pos = mio->impl.mem.pos; + old_size = mio->impl.mem.size; + va_copy (ap_copy, ap); + /* compute the size we will need into the buffer */ + n = vsnprintf (&tmp, 1, format, ap_copy); + va_end (ap_copy); + if (n >= 0 && mem_try_ensure_space (mio, ((guint)n) + 1)) { + guchar c; + + /* backup character at n+1 that will be overwritten by a \0 ... */ + c = mio->impl.mem.buf[mio->impl.mem.pos + (guint)n]; + rv = vsnprintf ((gchar *)&mio->impl.mem.buf[mio->impl.mem.pos], + (guint)n + 1, format, ap); @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5800] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5800 http://geany.svn.sourceforge.net/geany/?rev=5800&view=rev Author: statc Date: 2011-05-21 08:42:15 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5531..5540) Conflicts: src/project.c Modified Paths: -------------- branches/sm/ChangeLog branches/sm/data/filetype_extensions.conf branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/po/ChangeLog branches/sm/po/vi.po branches/sm/scintilla/Makefile.am branches/sm/scintilla/makefile.win32 branches/sm/scintilla/src/Catalogue.cxx branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/highlighting.c branches/sm/src/main.c branches/sm/src/plugindata.h branches/sm/src/project.c branches/sm/src/socket.c branches/sm/src/symbols.c branches/sm/src/utils.c branches/sm/src/utils.h branches/sm/tagmanager/Makefile.am branches/sm/tagmanager/latex.c branches/sm/tagmanager/makefile.win32 branches/sm/tagmanager/parsers.h branches/sm/tagmanager/php.c branches/sm/wscript Added Paths: ----------- branches/sm/data/filetypes.cobol branches/sm/scintilla/lexers/LexCOBOL.cxx branches/sm/tagmanager/cobol.c Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:40:22 UTC (rev 5799) +++ branches/sm/ChangeLog 2011-05-21 08:42:15 UTC (rev 5800) @@ -1,3 +1,39 @@ +2011-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * tagmanager/latex.c: + Add a workaround for #3066566 to prevent Geany from crashing during + loading of a LaTeX-file containing linebreaks inside headings. + + +2011-02-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/php.c: + Fix memory leaks (reported by an anonymous IRC user). + * doc/geany.txt, doc/geany.html: + Replace '+' by '-' in the Scintilla Keybindings section + to be consistent with the other mentioned keybindings. + * src/project.c: + Improve error checking when trying to write project files + (patch by Colomban Wendling, thanks). + Add a warning if writing the project file fails on close. + * src/utils.c, src/utils.h, src/project.c, src/main.c, src/socket.c: + Rename utils_is_file_writeable() into utils_is_file_writable(). + + +2011-01-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: + Ensure the editor widget has the focus when the editor menu is + called. + * scintilla/lexers/LexCOBOL.cxx, scintilla/src/Catalogue.cxx, + scintilla/Makefile.am, scintilla/makefile.win32, src/highlighting.c, + src/plugindata.h, src/filetypes.c, src/filetypes.h, src/editor.c, + src/symbols.c, tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/cobol.c, tagmanager/Makefile.am, data/filetypes.cobol, + data/filetype_extensions.conf, wscript: + Add filetype Cobol (based on a patch by Seth Keiper). + + 2011-01-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/filebrowser.c: Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-05-21 08:40:22 UTC (rev 5799) +++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:42:15 UTC (rev 5800) @@ -11,6 +11,7 @@ C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; +COBOL=*.cob;*.cpy;*.cbl;*.cobol; Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; CSS=*.css; D=*.d;*.di; Added: branches/sm/data/filetypes.cobol =================================================================== --- branches/sm/data/filetypes.cobol (rev 0) +++ branches/sm/data/filetypes.cobol 2011-05-21 08:42:15 UTC (rev 5800) @@ -0,0 +1,41 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=keyword +word2=keyword2 +string=string +character=string +operator=operator +identifier=default +quotedidentifier=default + +[keywords] +# all items must be in one line +keywords=accept access add address advancing after alphabet alphabetic alphabetic-lower alphabetic-upper alphanumeric alphanumeric-edited als alternate and any are area areas ascending assign at author before binary blank block bottom by cancel cbll cd cf ch character characters class clock-units close cobol code code-set collating column comma common communications computational compute configuration content continue control converting corr corresponding count currency data date date-compiled date-written day day-of-week de debug-contents debug-item debug-line debug-name debug-sub-1 debug-sub-2 debug-sub-3 debugging decimal-point delaratives delete delimited delimiter depending descending destination detail disable display divide division down duplicates dynamic egi else emi enable end-add end-compute end-delete end-divide end-evaluate end-if end-multiply end-of-page end-perform end-read end-receive end-return end-rewrite end-search end-start end-string end-subtract end-unstring end-write environment equal error esi evaluate every exception extend external false fd file file-control filler final first footing for from generate giving global greater group heading high-value high-values i-o i-o-control identification in index indexed indicate initial initialize initiate input input-output inspect installation into is just justified key label last leading left length lock memory merge message mode modules move multiple multiply native negative next no not number numeric numeric-edited object-computer occurs of off omitted on open optional or order organization other output overflow packed-decimal padding page page-counter perform pf ph pic picture plus position positive printing procedure procedures procedd program program-id purge queue quotes random rd read receive record records redefines reel reference references relative release remainder removal replace replacing report reporting reports rerun reserve reset return returning reversed rewind rewrite rf rh right rounded same sd search section security segment segment-limited select send sentence separate sequence sequential set sign size sort sort-merge source source-computer special-names standard standard-1 standard-2 start status string sub-queue-1 sub-queue-2 sub-queue-3 subtract sum suppress symbolic sync synchronized table tallying tape terminal terminate test text than then through thru time times to top trailing true type unit unstring until up upon usage use using value values varying when with words working-storage write + +[settings] +# default extension used when saving files +extension=cob + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=*> +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=false + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:40:22 UTC (rev 5799) +++ branches/sm/doc/geany.html 2011-05-21 08:42:15 UTC (rev 5800) @@ -3,10 +3,10 @@ <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: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-12-30" /> +<meta name="date" content="2011-01-19" /> <style type="text/css"> /* @@ -139,380 +139,380 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-12-30</td></tr> +<td>2011-01-19</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>0.20</td></tr> +<td>0.21</td></tr> </tbody> </table> -<p>Copyright © 2005-2010</p> +<p>Copyright © 2005-2011</p> <p>This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code -of this program, and also in the chapter <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> -<div class="contents topic"> -<p class="topic-title first"><a id="contents" name="contents">Contents</a></p> +of this program, and also in the chapter <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> +<div class="contents topic" id="contents"> +<p class="topic-title first">Contents</p> <ul class="simple"> -<li><a class="reference" href="#introduction" id="id7" name="id7">Introduction</a><ul> -<li><a class="reference" href="#about-geany" id="id8" name="id8">About Geany</a></li> -<li><a class="reference" href="#where-to-get-it" id="id9" name="id9">Where to get it</a></li> -<li><a class="reference" href="#license" id="id10" name="id10">License</a></li> -<li><a class="reference" href="#about-this-document" id="id11" name="id11">About this document</a></li> +<li><a class="reference internal" href="#introduction" id="id7">Introduction</a><ul> +<li><a class="reference internal" href="#about-geany" id="id8">About Geany</a></li> +<li><a class="reference internal" href="#where-to-get-it" id="id9">Where to get it</a></li> +<li><a class="reference internal" href="#license" id="id10">License</a></li> +<li><a class="reference internal" href="#about-this-document" id="id11">About this document</a></li> </ul> </li> -<li><a class="reference" href="#installation" id="id12" name="id12">Installation</a><ul> -<li><a class="reference" href="#requirements" id="id13" name="id13">Requirements</a></li> -<li><a class="reference" href="#binary-packages" id="id14" name="id14">Binary packages</a></li> -<li><a class="reference" href="#source-compilation" id="id15" name="id15">Source compilation</a><ul> -<li><a class="reference" href="#autotools-based-build-system" id="id16" name="id16">Autotools based build system</a></li> -<li><a class="reference" href="#waf-based-build-system" id="id17" name="id17">Waf based build system</a><ul> -<li><a class="reference" href="#waf-cache" id="id18" name="id18">Waf Cache</a><ul> -<li><a class="reference" href="#cleaning-the-cache" id="id19" name="id19">Cleaning the Cache</a></li> +<li><a class="reference internal" href="#installation" id="id12">Installation</a><ul> +<li><a class="reference internal" href="#requirements" id="id13">Requirements</a></li> +<li><a class="reference internal" href="#binary-packages" id="id14">Binary packages</a></li> +<li><a class="reference internal" href="#source-compilation" id="id15">Source compilation</a><ul> +<li><a class="reference internal" href="#autotools-based-build-system" id="id16">Autotools based build system</a></li> +<li><a class="reference internal" href="#waf-based-build-system" id="id17">Waf based build system</a><ul> +<li><a class="reference internal" href="#waf-cache" id="id18">Waf Cache</a><ul> +<li><a class="reference internal" href="#cleaning-the-cache" id="id19">Cleaning the Cache</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#custom-installation" id="id20" name="id20">Custom installation</a></li> -<li><a class="reference" href="#dynamic-linking-loader-support-and-vte" id="id21" name="id21">Dynamic linking loader support and VTE</a></li> -<li><a class="reference" href="#build-problems" id="id22" name="id22">Build problems</a></li> +<li><a class="reference internal" href="#custom-installation" id="id20">Custom installation</a></li> +<li><a class="reference internal" href="#dynamic-linking-loader-support-and-vte" id="id21">Dynamic linking loader support and VTE</a></li> +<li><a class="reference internal" href="#build-problems" id="id22">Build problems</a></li> </ul> </li> -<li><a class="reference" href="#installation-prefix" id="id23" name="id23">Installation prefix</a></li> +<li><a class="reference internal" href="#installation-prefix" id="id23">Installation prefix</a></li> </ul> </li> -<li><a class="reference" href="#usage" id="id24" name="id24">Usage</a><ul> -<li><a class="reference" href="#getting-started" id="id25" name="id25">Getting started</a></li> -<li><a class="reference" href="#the-geany-workspace" id="id26" name="id26">The Geany workspace</a></li> -<li><a class="reference" href="#command-line-options" id="id27" name="id27">Command line options</a></li> -<li><a class="reference" href="#general" id="id28" name="id28">General</a><ul> -<li><a class="reference" href="#startup" id="id29" name="id29">Startup</a></li> -<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id30" name="id30">Opening files from the command-line in a running instance</a></li> -<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id31" name="id31">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id32" name="id32">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference internal" href="#usage" id="id24">Usage</a><ul> +<li><a class="reference internal" href="#getting-started" id="id25">Getting started</a></li> +<li><a class="reference internal" href="#the-geany-workspace" id="id26">The Geany workspace</a></li> +<li><a class="reference internal" href="#command-line-options" id="id27">Command line options</a></li> +<li><a class="reference internal" href="#general" id="id28">General</a><ul> +<li><a class="reference internal" href="#startup" id="id29">Startup</a></li> +<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id30">Opening files from the command-line in a running instance</a></li> +<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id31">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id32">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference" href="#documents" id="id33" name="id33">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id34" name="id34">Switching between documents</a></li> +<li><a class="reference internal" href="#documents" id="id33">Documents</a><ul> +<li><a class="reference internal" href="#switching-between-documents" id="id34">Switching between documents</a></li> </ul> </li> -<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id35" name="id35">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference" href="#using-character-sets" id="id36" name="id36">Using character sets</a></li> -<li><a class="reference" href="#in-file-encoding-specification" id="id37" name="id37">In-file encoding specification</a></li> -<li><a class="reference" href="#special-encoding-none" id="id38" name="id38">Special encoding "None"</a></li> -<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id39" name="id39">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id35">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference internal" href="#using-character-sets" id="id36">Using character sets</a></li> +<li><a class="reference internal" href="#in-file-encoding-specification" id="id37">In-file encoding specification</a></li> +<li><a class="reference internal" href="#special-encoding-none" id="id38">Special encoding "None"</a></li> +<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id39">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference" href="#editing" id="id40" name="id40">Editing</a><ul> -<li><a class="reference" href="#folding" id="id41" name="id41">Folding</a></li> -<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id42" name="id42">Column mode editing (rectangular selections)</a></li> -<li><a class="reference" href="#drag-and-drop-of-text" id="id43" name="id43">Drag and drop of text</a></li> -<li><a class="reference" href="#indentation" id="id44" name="id44">Indentation</a><ul> -<li><a class="reference" href="#applying-new-indentation-settings" id="id45" name="id45">Applying new indentation settings</a></li> -<li><a class="reference" href="#detecting-indent-type" id="id46" name="id46">Detecting indent type</a></li> +<li><a class="reference internal" href="#editing" id="id40">Editing</a><ul> +<li><a class="reference internal" href="#folding" id="id41">Folding</a></li> +<li><a class="reference internal" href="#column-mode-editing-rectangular-selections" id="id42">Column mode editing (rectangular selections)</a></li> +<li><a class="reference internal" href="#drag-and-drop-of-text" id="id43">Drag and drop of text</a></li> +<li><a class="reference internal" href="#indentation" id="id44">Indentation</a><ul> +<li><a class="reference internal" href="#applying-new-indentation-settings" id="id45">Applying new indentation settings</a></li> +<li><a class="reference internal" href="#detecting-indent-type" id="id46">Detecting indent type</a></li> </ul> </li> -<li><a class="reference" href="#auto-indentation" id="id47" name="id47">Auto-indentation</a></li> -<li><a class="reference" href="#bookmarks" id="id48" name="id48">Bookmarks</a></li> -<li><a class="reference" href="#code-navigation-history" id="id49" name="id49">Code navigation history</a></li> -<li><a class="reference" href="#sending-text-through-custom-commands" id="id50" name="id50">Sending text through custom commands</a></li> -<li><a class="reference" href="#context-actions" id="id51" name="id51">Context actions</a></li> -<li><a class="reference" href="#autocompletion" id="id52" name="id52">Autocompletion</a><ul> -<li><a class="reference" href="#word-part-completion" id="id53" name="id53">Word part completion</a></li> -<li><a class="reference" href="#scope-autocompletion" id="id54" name="id54">Scope autocompletion</a></li> +<li><a class="reference internal" href="#auto-indentation" id="id47">Auto-indentation</a></li> +<li><a class="reference internal" href="#bookmarks" id="id48">Bookmarks</a></li> +<li><a class="reference internal" href="#code-navigation-history" id="id49">Code navigation history</a></li> +<li><a class="reference internal" href="#sending-text-through-custom-commands" id="id50">Sending text through custom commands</a></li> +<li><a class="reference internal" href="#context-actions" id="id51">Context actions</a></li> +<li><a class="reference internal" href="#autocompletion" id="id52">Autocompletion</a><ul> +<li><a class="reference internal" href="#word-part-completion" id="id53">Word part completion</a></li> +<li><a class="reference internal" href="#scope-autocompletion" id="id54">Scope autocompletion</a></li> </ul> </li> -<li><a class="reference" href="#user-definable-snippets" id="id55" name="id55">User-definable snippets</a><ul> -<li><a class="reference" href="#snippet-keybindings" id="id56" name="id56">Snippet keybindings</a></li> +<li><a class="reference internal" href="#user-definable-snippets" id="id55">User-definable snippets</a><ul> +<li><a class="reference internal" href="#snippet-keybindings" id="id56">Snippet keybindings</a></li> </ul> </li> -<li><a class="reference" href="#inserting-unicode-characters" id="id57" name="id57">Inserting Unicode characters</a></li> +<li><a class="reference internal" href="#inserting-unicode-characters" id="id57">Inserting Unicode characters</a></li> </ul> </li> -<li><a class="reference" href="#search-replace-and-go-to" id="id58" name="id58">Search, replace and go to</a><ul> -<li><a class="reference" href="#toolbar-entries" id="id59" name="id59">Toolbar entries</a><ul> -<li><a class="reference" href="#search-bar" id="id60" name="id60">Search bar</a></li> +<li><a class="reference internal" href="#search-replace-and-go-to" id="id58">Search, replace and go to</a><ul> +<li><a class="reference internal" href="#toolbar-entries" id="id59">Toolbar entries</a><ul> +<li><a class="reference internal" href="#search-bar" id="id60">Search bar</a></li> </ul> </li> -<li><a class="reference" href="#find" id="id61" name="id61">Find</a><ul> -<li><a class="reference" href="#matching-options" id="id62" name="id62">Matching options</a></li> -<li><a class="reference" href="#find-all" id="id63" name="id63">Find all</a></li> -<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id64" name="id64">Change font in search dialog text fields</a></li> +<li><a class="reference internal" href="#find" id="id61">Find</a><ul> +<li><a class="reference internal" href="#matching-options" id="id62">Matching options</a></li> +<li><a class="reference internal" href="#find-all" id="id63">Find all</a></li> +<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id64">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference" href="#find-selection" id="id65" name="id65">Find selection</a></li> -<li><a class="reference" href="#find-usage" id="id66" name="id66">Find usage</a></li> -<li><a class="reference" href="#find-in-files" id="id67" name="id67">Find in files</a><ul> -<li><a class="reference" href="#filtering-out-version-control-files" id="id68" name="id68">Filtering out version control files</a></li> +<li><a class="reference internal" href="#find-selection" id="id65">Find selection</a></li> +<li><a class="reference internal" href="#find-usage" id="id66">Find usage</a></li> +<li><a class="reference internal" href="#find-in-files" id="id67">Find in files</a><ul> +<li><a class="reference internal" href="#filtering-out-version-control-files" id="id68">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference" href="#replace" id="id69" name="id69">Replace</a><ul> -<li><a class="reference" href="#replace-all" id="id70" name="id70">Replace all</a></li> +<li><a class="reference internal" href="#replace" id="id69">Replace</a><ul> +<li><a class="reference internal" href="#replace-all" id="id70">Replace all</a></li> </ul> </li> -<li><a class="reference" href="#go-to-tag-definition" id="id71" name="id71">Go to tag definition</a></li> -<li><a class="reference" href="#go-to-tag-declaration" id="id72" name="id72">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-line" id="id73" name="id73">Go to line</a></li> -<li><a class="reference" href="#regular-expressions" id="id74" name="id74">Regular expressions</a></li> +<li><a class="reference internal" href="#go-to-tag-definition" id="id71">Go to tag definition</a></li> +<li><a class="reference internal" href="#go-to-tag-declaration" id="id72">Go to tag declaration</a></li> +<li><a class="reference internal" href="#go-to-line" id="id73">Go to line</a></li> +<li><a class="reference internal" href="#regular-expressions" id="id74">Regular expressions</a></li> </ul> </li> -<li><a class="reference" href="#view-menu" id="id75" name="id75">View menu</a><ul> -<li><a class="reference" href="#color-schemes-menu" id="id76" name="id76">Color schemes menu</a></li> +<li><a class="reference internal" href="#view-menu" id="id75">View menu</a><ul> +<li><a class="reference internal" href="#color-schemes-menu" id="id76">Color schemes menu</a></li> </ul> </li> -<li><a class="reference" href="#tags" id="id77" name="id77">Tags</a><ul> -<li><a class="reference" href="#workspace-tags" id="id78" name="id78">Workspace tags</a></li> -<li><a class="reference" href="#global-tags" id="id79" name="id79">Global tags</a><ul> -<li><a class="reference" href="#default-global-tags-files" id="id80" name="id80">Default global tags files</a></li> -<li><a class="reference" href="#global-tags-file-format" id="id81" name="id81">Global tags file format</a></li> -<li><a class="reference" href="#generating-a-global-tags-file" id="id82" name="id82">Generating a global tags file</a></li> +<li><a class="reference internal" href="#tags" id="id77">Tags</a><ul> +<li><a class="reference internal" href="#workspace-tags" id="id78">Workspace tags</a></li> +<li><a class="reference internal" href="#global-tags" id="id79">Global tags</a><ul> +<li><a class="reference internal" href="#default-global-tags-files" id="id80">Default global tags files</a></li> +<li><a class="reference internal" href="#global-tags-file-format" id="id81">Global tags file format</a></li> +<li><a class="reference internal" href="#generating-a-global-tags-file" id="id82">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#c-ignore-tags" id="id83" name="id83">C Ignore tags</a></li> +<li><a class="reference internal" href="#c-ignore-tags" id="id83">C Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id84" name="id84">Preferences</a><ul> -<li><a class="reference" href="#general-startup-preferences" id="id85" name="id85">General Startup preferences</a><ul> -<li><a class="reference" href="#id1" id="id86" name="id86">Startup</a></li> -<li><a class="reference" href="#shutdown" id="id87" name="id87">Shutdown</a></li> -<li><a class="reference" href="#paths" id="id88" name="id88">Paths</a></li> +<li><a class="reference internal" href="#preferences" id="id84">Preferences</a><ul> +<li><a class="reference internal" href="#general-startup-preferences" id="id85">General Startup preferences</a><ul> +<li><a class="reference internal" href="#id1" id="id86">Startup</a></li> +<li><a class="reference internal" href="#shutdown" id="id87">Shutdown</a></li> +<li><a class="reference internal" href="#paths" id="id88">Paths</a></li> </ul> </li> -<li><a class="reference" href="#general-miscellaneous-preferences" id="id89" name="id89">General Miscellaneous preferences</a><ul> -<li><a class="reference" href="#miscellaneous" id="id90" name="id90">Miscellaneous</a></li> -<li><a class="reference" href="#search" id="id91" name="id91">Search</a></li> -<li><a class="reference" href="#projects" id="id92" name="id92">Projects</a></li> +<li><a class="reference internal" href="#general-miscellaneous-preferences" id="id89">General Miscellaneous preferences</a><ul> +<li><a class="reference internal" href="#miscellaneous" id="id90">Miscellaneous</a></li> +<li><a class="reference internal" href="#search" id="id91">Search</a></li> +<li><a class="reference internal" href="#projects" id="id92">Projects</a></li> </ul> </li> -<li><a class="reference" href="#interface-preferences" id="id93" name="id93">Interface preferences</a><ul> -<li><a class="reference" href="#sidebar" id="id94" name="id94">Sidebar</a></li> -<li><a class="reference" href="#fonts" id="id95" name="id95">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id96" name="id96">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id97" name="id97">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id98" name="id98">Miscellaneous</a></li> +<li><a class="reference internal" href="#interface-preferences" id="id93">Interface preferences</a><ul> +<li><a class="reference internal" href="#sidebar" id="id94">Sidebar</a></li> +<li><a class="reference internal" href="#fonts" id="id95">Fonts</a></li> +<li><a class="reference internal" href="#editor-tabs" id="id96">Editor tabs</a></li> +<li><a class="reference internal" href="#tab-positions" id="id97">Tab positions</a></li> +<li><a class="reference internal" href="#id2" id="id98">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-preferences" id="id99" name="id99">Toolbar preferences</a><ul> -<li><a class="reference" href="#toolbar" id="id100" name="id100">Toolbar</a></li> -<li><a class="reference" href="#appearance" id="id101" name="id101">Appearance</a></li> +<li><a class="reference internal" href="#toolbar-preferences" id="id99">Toolbar preferences</a><ul> +<li><a class="reference internal" href="#toolbar" id="id100">Toolbar</a></li> +<li><a class="reference internal" href="#appearance" id="id101">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-preferences" id="id102" name="id102">Editor Features preferences</a><ul> -<li><a class="reference" href="#features" id="id103" name="id103">Features</a></li> +<li><a class="reference internal" href="#editor-features-preferences" id="id102">Editor Features preferences</a><ul> +<li><a class="reference internal" href="#features" id="id103">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-indentation-preferences" id="id104" name="id104">Editor Indentation preferences</a><ul> -<li><a class="reference" href="#indentation-group" id="id105" name="id105">Indentation group</a></li> +<li><a class="reference internal" href="#editor-indentation-preferences" id="id104">Editor Indentation preferences</a><ul> +<li><a class="reference internal" href="#indentation-group" id="id105">Indentation group</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-preferences" id="id106" name="id106">Editor Completions preferences</a><ul> -<li><a class="reference" href="#completions" id="id107" name="id107">Completions</a></li> -<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id108" name="id108">Auto-close quotes and brackets</a></li> +<li><a class="reference internal" href="#editor-completions-preferences" id="id106">Editor Completions preferences</a><ul> +<li><a class="reference internal" href="#completions" id="id107">Completions</a></li> +<li><a class="reference internal" href="#auto-close-quotes-and-brackets" id="id108">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference" href="#editor-display-preferences" id="id109" name="id109">Editor Display preferences</a><ul> -<li><a class="reference" href="#display" id="id110" name="id110">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id111" name="id111">Long line marker</a></li> -<li><a class="reference" href="#virtual-spaces" id="id112" name="id112">Virtual spaces</a></li> +<li><a class="reference internal" href="#editor-display-preferences" id="id109">Editor Display preferences</a><ul> +<li><a class="reference internal" href="#display" id="id110">Display</a></li> +<li><a class="reference internal" href="#long-line-marker" id="id111">Long line marker</a></li> +<li><a class="reference internal" href="#virtual-spaces" id="id112">Virtual spaces</a></li> </ul> </li> -<li><a class="reference" href="#files-preferences" id="id113" name="id113">Files preferences</a><ul> -<li><a class="reference" href="#new-files" id="id114" name="id114">New files</a></li> -<li><a class="reference" href="#saving-files" id="id115" name="id115">Saving files</a></li> -<li><a class="reference" href="#id3" id="id116" name="id116">Miscellaneous</a></li> +<li><a class="reference internal" href="#files-preferences" id="id113">Files preferences</a><ul> +<li><a class="reference internal" href="#new-files" id="id114">New files</a></li> +<li><a class="reference internal" href="#saving-files" id="id115">Saving files</a></li> +<li><a class="reference internal" href="#id3" id="id116">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#tools-preferences" id="id117" name="id117">Tools preferences</a><ul> -<li><a class="reference" href="#tool-paths" id="id118" name="id118">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id119" name="id119">Commands</a></li> +<li><a class="reference internal" href="#tools-preferences" id="id117">Tools preferences</a><ul> +<li><a class="reference internal" href="#tool-paths" id="id118">Tool paths</a></li> +<li><a class="reference internal" href="#commands" id="id119">Commands</a></li> </ul> </li> -<li><a class="reference" href="#template-preferences" id="id120" name="id120">Template preferences</a><ul> -<li><a class="reference" href="#template-data" id="id121" name="id121">Template data</a></li> +<li><a class="reference internal" href="#template-preferences" id="id120">Template preferences</a><ul> +<li><a class="reference internal" href="#template-data" id="id121">Template data</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-preferences" id="id122" name="id122">Keybinding preferences</a></li> -<li><a class="reference" href="#printing-preferences" id="id123" name="id123">Printing preferences</a></li> -<li><a class="reference" href="#terminal-vte-preferences" id="id124" name="id124">Terminal (VTE) preferences</a><ul> -<li><a class="reference" href="#terminal-widget" id="id125" name="id125">Terminal widget</a></li> +<li><a class="reference internal" href="#keybinding-preferences" id="id122">Keybinding preferences</a></li> +<li><a class="reference internal" href="#printing-preferences" id="id123">Printing preferences</a></li> +<li><a class="reference internal" href="#terminal-vte-preferences" id="id124">Terminal (VTE) preferences</a><ul> +<li><a class="reference internal" href="#terminal-widget" id="id125">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#project-management" id="id126" name="id126">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id127" name="id127">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id128" name="id128">Project Properties</a></li> -<li><a class="reference" href="#open-project" id="id129" name="id129">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id130" name="id130">Close Project</a></li> +<li><a class="reference internal" href="#project-management" id="id126">Project Management</a><ul> +<li><a class="reference internal" href="#new-project" id="id127">New Project</a></li> +<li><a class="reference internal" href="#project-properties" id="id128">Project Properties</a></li> +<li><a class="reference internal" href="#open-project" id="id129">Open Project</a></li> +<li><a class="reference internal" href="#close-project" id="id130">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-menu" id="id131" name="id131">Build Menu</a><ul> -<li><a class="reference" href="#indicators" id="id132" name="id132">Indicators</a></li> -<li><a class="reference" href="#default-build-menu-items" id="id133" name="id133">Default Build Menu Items</a><ul> -<li><a class="reference" href="#compile" id="id134" name="id134">Compile</a></li> -<li><a class="reference" href="#build" id="id135" name="id135">Build</a></li> -<li><a class="reference" href="#make" id="id136" name="id136">Make</a></li> -<li><a class="reference" href="#make-custom-target" id="id137" name="id137">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id138" name="id138">Make object</a></li> -<li><a class="reference" href="#next-error" id="id139" name="id139">Next Error</a></li> -<li><a class="reference" href="#previous-error" id="id140" name="id140">Previous Error</a></li> -<li><a class="reference" href="#execute" id="id141" name="id141">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id142" name="id142">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id143" name="id143">Terminal emulators</a></li> +<li><a class="reference internal" href="#build-menu" id="id131">Build Menu</a><ul> +<li><a class="reference internal" href="#indicators" id="id132">Indicators</a></li> +<li><a class="reference internal" href="#default-build-menu-items" id="id133">Default Build Menu Items</a><ul> +<li><a class="reference internal" href="#compile" id="id134">Compile</a></li> +<li><a class="reference internal" href="#build" id="id135">Build</a></li> +<li><a class="reference internal" href="#make" id="id136">Make</a></li> +<li><a class="reference internal" href="#make-custom-target" id="id137">Make custom target</a></li> +<li><a class="reference internal" href="#make-object" id="id138">Make object</a></li> +<li><a class="reference internal" href="#next-error" id="id139">Next Error</a></li> +<li><a class="reference internal" href="#previous-error" id="id140">Previous Error</a></li> +<li><a class="reference internal" href="#execute" id="id141">Execute</a></li> +<li><a class="reference internal" href="#stopping-running-processes" id="id142">Stopping running processes</a><ul> +<li><a class="reference internal" href="#terminal-emulators" id="id143">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#set-build-commands" id="id144" name="id144">Set Build Commands</a></li> +<li><a class="reference internal" href="#set-build-commands" id="id144">Set Build Commands</a></li> </ul> </li> -<li><a class="reference" href="#build-menu-configuration" id="id145" name="id145">Build Menu Configuration</a></li> -<li><a class="reference" href="#build-menu-commands-dialog" id="id146" name="id146">Build Menu Commands Dialog</a><ul> -<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id147" name="id147">Substitutions in Commands and Working Directories</a></li> -<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id148" name="id148">Build Menu Keyboard Shortcuts</a></li> -<li><a class="reference" href="#old-settings" id="id149" name="id149">Old settings</a></li> +<li><a class="reference internal" href="#build-menu-configuration" id="id145">Build Menu Configuration</a></li> +<li><a class="reference internal" href="#build-menu-commands-dialog" id="id146">Build Menu Commands Dialog</a><ul> +<li><a class="reference internal" href="#substitutions-in-commands-and-working-directories" id="id147">Substitutions in Commands and Working Directories</a></li> +<li><a class="reference internal" href="#build-menu-keyboard-shortcuts" id="id148">Build Menu Keyboard Shortcuts</a></li> +<li><a class="reference internal" href="#old-settings" id="id149">Old settings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id150" name="id150">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id151" name="id151">Plugins</a><ul> -<li><a class="reference" href="#plugin-manager" id="id152" name="id152">Plugin Manager</a></li> +<li><a class="reference internal" href="#printing-support" id="id150">Printing support</a></li> +<li><a class="reference internal" href="#plugins" id="id151">Plugins</a><ul> +<li><a class="reference internal" href="#plugin-manager" id="id152">Plugin Manager</a></li> </ul> </li> -<li><a class="reference" href="#keybindings" id="id153" name="id153">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id154" name="id154">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id155" name="id155">Configurable keybindings</a><ul> -<li><a class="reference" href="#file-keybindings" id="id156" name="id156">File keybindings</a></li> -<li><a class="reference" href="#editor-keybindings" id="id157" name="id157">Editor keybindings</a></li> -<li><a class="reference" href="#clipboard-keybindings" id="id158" name="id158">Clipboard keybindings</a></li> -<li><a class="reference" href="#select-keybindings" id="id159" name="id159">Select keybindings</a></li> -<li><a class="reference" href="#insert-keybindings" id="id160" name="id160">Insert keybindings</a></li> -<li><a class="reference" href="#format-keybindings" id="id161" name="id161">Format keybindings</a></li> -<li><a class="reference" href="#settings-keybindings" id="id162" name="id162">Settings keybindings</a></li> -<li><a class="reference" href="#search-keybindings" id="id163" name="id163">Search keybindings</a></li> -<li><a class="reference" href="#go-to-keybindings" id="id164" name="id164">Go to keybindings</a></li> -<li><a class="reference" href="#view-keybindings" id="id165" name="id165">View keybindings</a></li> -<li><a class="reference" href="#focus-keybindings" id="id166" name="id166">Focus keybindings</a></li> -<li><a class="reference" href="#notebook-tab-keybindings" id="id167" name="id167">Notebook tab keybindings</a></li> -<li><a class="reference" href="#document-keybindings" id="id168" name="id168">Document keybindings</a></li> -<li><a class="reference" href="#build-keybindings" id="id169" name="id169">Build keybindings</a></li> -<li><a class="reference" href="#tools-keybindings" id="id170" name="id170">Tools keybindings</a></li> -<li><a class="reference" href="#help-keybindings" id="id171" name="id171">Help keybindings</a></li> +<li><a class="reference internal" href="#keybindings" id="id153">Keybindings</a><ul> +<li><a class="reference internal" href="#switching-documents" id="id154">Switching documents</a></li> +<li><a class="reference internal" href="#configurable-keybindings" id="id155">Configurable keybindings</a><ul> +<li><a class="reference internal" href="#file-keybindings" id="id156">File keybindings</a></li> +<li><a class="reference internal" href="#editor-keybindings" id="id157">Editor keybindings</a></li> +<li><a class="reference internal" href="#clipboard-keybindings" id="id158">Clipboard keybindings</a></li> +<li><a class="reference internal" href="#select-keybindings" id="id159">Select keybindings</a></li> +<li><a class="reference internal" href="#insert-keybindings" id="id160">Insert keybindings</a></li> +<li><a class="reference internal" href="#format-keybindings" id="id161">Format keybindings</a></li> +<li><a class="reference internal" href="#settings-keybindings" id="id162">Settings keybindings</a></li> +<li><a class="reference internal" href="#search-keybindings" id="id163">Search keybindings</a></li> +<li><a class="reference internal" href="#go-to-keybindings" id="id164">Go to keybindings</a></li> +<li><a class="reference internal" href="#view-keybindings" id="id165">View keybindings</a></li> +<li><a class="reference internal" href="#focus-keybindings" id="id166">Focus keybindings</a></li> +<li><a class="reference internal" href="#notebook-tab-keybindings" id="id167">Notebook tab keybindings</a></li> +<li><a class="reference internal" href="#document-keybindings" id="id168">Document keybindings</a></li> +<li><a class="reference internal" href="#build-keybindings" id="id169">Build keybindings</a></li> +<li><a class="reference internal" href="#tools-keybindings" id="id170">Tools keybindings</a></li> +<li><a class="reference internal" href="#help-keybindings" id="id171">Help keybindings</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id172" name="id172">Configuration files</a><ul> -<li><a class="reference" href="#configuration-file-paths" id="id173" name="id173">Configuration file paths</a><ul> -<li><a class="reference" href="#paths-on-unix-like-systems" id="id174" name="id174">Paths on Unix-like systems</a></li> +<li><a class="reference internal" href="#configuration-files" id="id172">Configuration files</a><ul> +<li><a class="reference internal" href="#configuration-file-paths" id="id173">Configuration file paths</a><ul> +<li><a class="reference internal" href="#paths-on-unix-like-systems" id="id174">Paths on Unix-like systems</a></li> </ul> </li> -<li><a class="reference" href="#tools-menu-items" id="id175" name="id175">Tools menu items</a></li> -<li><a class="reference" href="#global-configuration-file" id="id176" name="id176">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id177" name="id177">Filetype definition files</a><ul> -<li><a class="reference" href="#system-files" id="id178" name="id178">System files</a></li> -<li><a class="reference" href="#user-files" id="id179" name="id179">User files</a></li> -<li><a class="reference" href="#custom-filetypes" id="id180" name="id180">Custom filetypes</a><ul> -<li><a class="reference" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id181" name="id181">Creating a custom filetype from an existing filetype</a></li> +<li><a class="reference internal" href="#tools-menu-items" id="id175">Tools menu items</a></li> +<li><a class="reference internal" href="#global-configuration-file" id="id176">Global configuration file</a></li> +<li><a class="reference internal" href="#filetype-definition-files" id="id177">Filetype definition files</a><ul> +<li><a class="reference internal" href="#system-files" id="id178">System files</a></li> +<li><a class="reference internal" href="#user-files" id="id179">User files</a></li> +<li><a class="reference internal" href="#custom-filetypes" id="id180">Custom filetypes</a><ul> +<li><a class="reference internal" href="#creating-a-custom-filetype-from-an-existing-filetype" id="id181">Creating a custom filetype from an existing filetype</a></li> </ul> </li> -<li><a class="reference" href="#filetype-configuration" id="id182" name="id182">Filetype configuration</a><ul> -<li><a class="reference" href="#styling-section" id="id183" name="id183">[styling] Section</a><ul> -<li><a class="reference" href="#using-a-named-style" id="id184" name="id184">Using a named style</a></li> +<li><a class="reference internal" href="#filetype-configuration" id="id182">Filetype configuration</a><ul> +<li><a class="reference internal" href="#styling-section" id="id183">[styling] Section</a><ul> +<li><a class="reference internal" href="#using-a-named-style" id="id184">Using a named style</a></li> </ul> </li> -<li><a class="reference" href="#keywords-section" id="id185" name="id185">[keywords] Section</a></li> -<li><a class="reference" href="#lexer-properties-section" id="id186" name="id186">[lexer_properties] Section</a></li> -<li><a class="reference" href="#settings-section" id="id187" name="id187">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id188" name="id188">[build_settings] Section</a></li> +<li><a class="reference internal" href="#keywords-section" id="id185">[keywords] Section</a></li> +<li><a class="reference internal" href="#lexer-properties-section" id="id186">[lexer_properties] Section</a></li> +<li><a class="reference internal" href="#settings-section" id="id187">[settings] Section</a></li> +<li><a class="reference internal" href="#build-settings-section" id="id188">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id189" name="id189">Special file filetypes.common</a><ul> -<li><a class="reference" href="#named-styles-section" id="id190" name="id190">[named_styles] Section</a></li> -<li><a class="reference" href="#id4" id="id191" name="id191">[styling] Section</a></li> -<li><a class="reference" href="#id5" id="id192" name="id192">[settings] Section</a></li> +<li><a class="reference internal" href="#special-file-filetypes-common" id="id189">Special file filetypes.common</a><ul> +<li><a class="reference internal" href="#named-styles-section" id="id190">[named_styles] Section</a></li> +<li><a class="reference internal" href="#id4" id="id191">[styling] Section</a></li> +<li><a class="reference internal" href="#id5" id="id192">[settings] Section</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id193" name="id193">Filetype extensions</a></li> -<li><a class="reference" href="#preferences-file-format" id="id194" name="id194">Preferences File Format</a><ul> -<li><a class="reference" href="#hidden-preferences" id="id195" name="id195">Hidden preferences</a></li> -<li><a class="reference" href="#build-menu-section" id="id196" name="id196">[build-menu] Section</a></li> +<li><a class="reference internal" href="#filetype-extensions" id="id193">Filetype extensions</a></li> +<li><a class="reference internal" href="#preferences-file-format" id="id194">Preferences File Format</a><ul> +<li><a class="reference internal" href="#hidden-preferences" id="id195">Hidden preferences</a></li> +<li><a class="reference internal" href="#build-menu-section" id="id196">[build-menu] Section</a></li> </ul> </li> -<li><a class="reference" href="#project-file-format" id="id197" name="id197">Project File Format</a><ul> -<li><a class="reference" href="#build-menu-additions" id="id198" name="id198">[build-menu] Additions</a></li> +<li><a class="reference internal" href="#project-file-format" id="id197">Project File Format</a><ul> +<li><a class="reference internal" href="#build-menu-additions" id="id198">[build-menu] Additions</a></li> </ul> </li> -<li><a class="reference" href="#templates" id="id199" name="id199">Templates</a><ul> -<li><a class="reference" href="#template-meta-data" id="id200" name="id200">Template meta data</a></li> -<li><a class="reference" href="#file-templates" id="id201" name="id201">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id202" name="id202">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id203" name="id203">Filetype templates</a></li> +<li><a class="reference internal" href="#templates" id="id199">Templates</a><ul> +<li><a class="reference internal" href="#template-meta-data" id="id200">Template meta data</a></li> +<li><a class="reference internal" href="#file-templates" id="id201">File templates</a><ul> +<li><a class="reference internal" href="#custom-file-templates" id="id202">Custom file templates</a></li> +<li><a class="reference internal" href="#filetype-templates" id="id203">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id204" name="id204">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id205" name="id205">Template wildcards</a><ul> -<li><a class="reference" href="#special-command-wildcard" id="id206" name="id206">Special {command:} wildcard</a></li> +<li><a class="reference internal" href="#customizing-templates" id="id204">Customizing templates</a><ul> +<li><a class="reference internal" href="#template-wildcards" id="id205">Template wildcards</a><ul> +<li><a class="reference internal" href="#special-command-wildcard" id="id206">Special {command:} wildcard</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#customizing-the-toolbar" id="id207" name="id207">Customizing the toolbar</a><ul> -<li><a class="reference" href="#manually-editing-the-toolbar-layout" id="id208" name="id208">Manually editing the toolbar layout</a></li> -<li><a class="reference" href="#available-toolbar-elements" id="id209" name="id209">Available toolbar elements</a></li> +<li><a class="reference internal" href="#customizing-the-toolbar" id="id207">Customizing the toolbar</a><ul> +<li><a class="reference internal" href="#manually-editing-the-toolbar-layout" id="id208">Manually editing the toolbar layout</a></li> +<li><a class="reference internal" href="#available-toolbar-elements" id="id209">Available toolbar elements</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id210" name="id210">Plugin documentation</a><ul> -<li><a class="reference" href="#html-characters" id="id211" name="id211">HTML Characters</a><ul> -<li><a class="reference" href="#insert-entity-dialog" id="id212" name="id212">Insert entity dialog</a></li> -<li><a class="reference" href="#replace-special-chars-by-its-entity" id="id213" name="id213">Replace special chars by its entity</a><ul> -<li><a class="reference" href="#at-typing-time" id="id214" name="id214">At typing time</a></li> -<li><a class="reference" href="#bulk-replacement" id="id215" name="id215">Bulk replacement</a></li> +<li><a class="reference internal" href="#plugin-documentation" id="id210">Plugin documentation</a><ul> +<li><a class="reference internal" href="#html-characters" id="id211">HTML Characters</a><ul> +<li><a class="reference internal" href="#insert-entity-dialog" id="id212">Insert entity dialog</a></li> +<li><a class="reference internal" href="#replace-special-chars-by-its-entity" id="id213">Replace special chars by its entity</a><ul> +<li><a class="reference internal" href="#at-typing-time" id="id214">At typing time</a></li> +<li><a class="reference internal" href="#bulk-replacement" id="id215">Bulk replacement</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#save-actions" id="id216" name="id216">Save Actions</a><ul> -<li><a class="reference" href="#instant-save" id="id217" name="id217">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id218" name="id218">Backup Copy</a></li> +<li><a class="reference internal" href="#save-actions" id="id216">Save Actions</a><ul> +<li><a class="reference internal" href="#instant-save" id="id217">Instant Save</a></li> +<li><a class="reference internal" href="#backup-copy" id="id218">Backup Copy</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id219" name="id219">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id220" name="id220">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id221" name="id221">Keyboard commands</a></li> +<li><a class="reference internal" href="#contributing-to-this-document" id="id219">Contributing to this document</a></li> +<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id220">Scintilla keyboard commands</a><ul> +<li><a class="reference internal" href="#keyboard-commands" id="id221">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id222" name="id222">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id223" name="id223">Document notebook</a></li> -<li><a class="reference" href="#editor" id="id224" name="id224">Editor</a></li> -<li><a class="reference" href="#interface" id="id225" name="id225">Interface</a></li> -<li><a class="reference" href="#gtk-related" id="id226" name="id226">GTK-related</a></li> +<li><a class="reference internal" href="#tips-and-tricks" id="id222">Tips and tricks</a><ul> +<li><a class="reference internal" href="#document-notebook" id="id223">Document notebook</a></li> +<li><a class="reference internal" href="#editor" id="id224">Editor</a></li> +<li><a class="reference internal" href="#interface" id="id225">Interface</a></li> +<li><a class="reference internal" href="#gtk-related" id="id226">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#compile-time-options" id="id227" name="id227">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id228" name="id228">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id229" name="id229">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id230" name="id230">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id231" name="id231">keyfile.c</a></li> -<li><a class="reference" href="#build-c" id="id232" name="id232">build.c</a></li> +<li><a class="reference internal" href="#compile-time-options" id="id227">Compile-time options</a><ul> +<li><a class="reference internal" href="#src-geany-h" id="id228">src/geany.h</a></li> +<li><a class="reference internal" href="#project-h" id="id229">project.h</a></li> +<li><a class="reference internal" href="#editor-h" id="id230">editor.h</a></li> +<li><a class="reference internal" href="#keyfile-c" id="id231">keyfile.c</a></li> +<li><a class="reference internal" href="#build-c" id="id232">build.c</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id233" name="id233">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id234" name="id234">License for Scintilla and SciTE</a></li> +<li><a class="reference internal" href="#gnu-general-public-license" id="id233">GNU General Public License</a></li> +<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id234">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id7" id="introduction" name="introduction">Introduction</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id8" id="about-geany" name="about-geany">About Geany</a></h2> +<div class="section" id="introduction"> +<h1><a class="toc-backref" href="#id7">Introduction</a></h1> +<div class="section" id="about-geany"> +<h2><a class="toc-backref" href="#id8">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies on other packages. Another goal was to be as independent @@ -535,56 +535,56 @@ <li>Plugin interface</li> </ul> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id9" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> -<p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from +<div class="section" id="where-to-get-it"> +<h2><a class="toc-backref" href="#id9">Where to get it</a></h2> +<p>You can obtain Geany from <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distribution. For a list of available packages, please see -<a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +<a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id10" id="license" name="license">License</a></h2> +<div class="section" id="license"> +<h2><a class="toc-backref" href="#id10">License</a></h2> <p>Geany is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source -code of this program and in the chapter, <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> +code of this program and in the chapter, <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> <p>The included Scintilla library (found in the subdirectory -<tt class="docutils literal"><span class="pre">scintilla/</span></tt>) has its own license, which can be found in the chapter, -<a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> +<tt class="docutils literal">scintilla/</tt>) has its own license, which can be found in the chapter, +<a class="reference internal" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id11" id="about-this-document" name="about-this-document">About this document</a></h2> +<div class="section" id="about-this-document"> +<h2><a class="toc-backref" href="#id11">About this document</a></h2> <p>This documentation is available in HTML and text formats. -The latest version can always be found at <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a>.</p> -<p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> +The latest version can always be found at <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a>.</p> +<p>If you want to contribute to it, see <a class="reference internal" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id12" id="installation" name="installation">Installation</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id13" id="requirements" name="requirements">Requirements</a></h2> +<div class="section" id="installation"> +<h1><a class="toc-backref" href="#id12">Installation</a></h1> +<div class="section" id="requirements"> +<h2><a class="toc-backref" href="#id13">Requirements</a></h2> <p>You will need the GTK (>= 2.8.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer from the website which bundles these libraries.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id14" id="binary-packages" name="binary-packages">Binary packages</a></h2> +<div class="section" id="binary-packages"> +<h2><a class="toc-backref" href="#id14">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe -incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +incomplete list see <a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id15" id="source-compilation" name="source-compilation">Source compilation</a></h2> +<div class="section" id="source-compilation"> +<h2><a class="toc-backref" href="#id15">Source compilation</a></h2> <p>Compiling Geany is quite easy. To do so, you need the GTK (>= 2.8.0) libraries and header files. You also need the Pango, GLib and ATK libraries and header files. -All these files are available at <a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>, but very often +All these files are available at <a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C and C++ compiler. The GNU versions of these tools are recommended.</p> -<div class="section"> -<h3><a class="toc-backref" href="#id16" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> +<div class="section" id="autotools-based-build-system"> +<h3><a class="toc-backref" href="#id16">Autotools based build system</a></h3> <p>The Autotools based build system is very mature and has been well tested. To use it, you just need the Make tool, preferably GNU Make.</p> <p>Then run the following commands:</p> @@ -597,8 +597,8 @@ % make install </pre> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id17" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> +<div class="section" id="waf-based-build-system"> +<h3><a class="toc-backref" href="#id17">Waf based build system</a></h3> <p>The Waf build system is still quite young and under heavy development but already in a usable state. In contrast to the Autotools system, Waf needs Python. So before using Waf, you need to install Python on your system. @@ -606,7 +606,7 @@ build process might be a bit faster. Especially when you use the Waf cache feature for repetitive builds (e.g. when changing only a few source files to test something) will become much faster since Waf will cache and re-use the -unchanged built files and only compile the changed code again. See <a class="reference" href="#waf-cache">Waf Cache</a> for details. +unchanged built files and only compile the changed code again. See <a class="reference internal" href="#waf-cache">Waf Cache</a> for details. To build Geany with Waf as run:</p> <pre class="literal-block"> $ ./waf configure @@ -616,13 +616,13 @@ <pre class="literal-block"> % ./waf install </pre> -<div class="section"> -<h4><a class="toc-backref" href="#id18" id="waf-cache" name="waf-cache">Waf Cache</a></h4> +<div class="section" id="waf-cache"> +<h4><a class="toc-backref" href="#id18">Waf Cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help to avoid a lot of unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something in Geany. Waf is able to store and retrieve the object files from a cache. This cache is declared -using the environment variable <tt class="docutils literal"><span class="pre">WAFCACHE</span></tt>. +using the environment variable <tt class="docutils literal">WAFCACHE</tt>. A possible location of the cache directory could be <tt class="docutils literal"><span class="pre">~/.cache/waf</span></tt>. In order to make use of this, you first need to create this directory:</p> <pre class="literal-block"> @@ -633,11 +633,11 @@ <pre class="literal-block"> export WAFCACHE=/home/username/.cache/waf </pre> -<p>Remember to replace <tt class="docutils literal"><span class="pre">username</span></tt> with your actual username.</p> +<p>Remember to replace <tt class="docutils literal">username</tt> with your actual username.</p> <p>More information about the Waf cache feature are available at -<a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> -<div class="section"> -<h5><a class="toc-backref" href="#id19" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> +<a class="reference external" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> +<div class="section" id="cleaning-the-cache"> +<h5><a class="toc-backref" href="#id19">Cleaning the Cache</a></h5> <p>You should be careful about the size of the cache directory as it may grow rapidly over time. Waf doesn't do any cleaning or other house-keeping of the cache yet, so you need to keep it @@ -648,12 +648,12 @@ $ find /home/username/.cache/waf -mtime +14 -exec rm {} \; </pre> <p>This will delete all files in the cache directory which are older than 14 days.</p> -<p>For details about the <tt class="docutils literal"><span class="pre">find</span></tt> command and its options, check its manual page.</p> +<p>For details about the <tt class="docutils literal">find</tt> command and its options, check its manual page.</p> </div> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id20" id="custom-installation" name="custom-installation">Custom installation</a></h3> +<div class="section" id="custom-installation"> +<h3><a class="toc-backref" href="#id20">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -667,44 +667,44 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> +<li>See also <a class="reference internal" href="#compile-time-options">Compile-time options</a>.</li> </ul> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id21" id="dynamic-linking-loader-support-and-vte" name="dynamic-linking-loader-support-and-vte">Dynamic linking loader support and VTE</a></h3> +<div class="section" id="dynamic-linking-loader-support-and-vte"> +<h3><a class="toc-backref" href="#id21">Dynamic linking loader support and VTE</a></h3> <p>In the case that your system lacks dynamic linking loader support, you -probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> +probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal">configure</tt> script. This prevents compiling Geany with dynamic linking loader -support for automatically loading <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> +support for automatically loading <tt class="docutils literal">libvte.so.4</tt> if available.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id22" id="build-problems" name="build-problems">Build problems</a></h3> +<div class="section" id="build-problems"> +<h3><a class="toc-backref" href="#id22">Build problems</a></h3> <p>If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one the authors. Sometimes you might need to ask for specific help from your distribution.</p> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id23" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> +<div class="section" id="installation-prefix"> +<h2><a class="toc-backref" href="#id23">Installation prefix</a></h2> <p>If you want to find Geany's system files after installation you may want to know the installation prefix.</p> <p>Pass the <tt class="docutils literal"><span class="pre">--print-prefix</span></tt> option to Geany to check this - see -<a class="reference" href="#command-line-options">Command line options</a>. The first path is the prefix.</p> -<p>On Unix-like systems this is commonly <tt class="docutils literal"><span class="pre">/usr</span></tt> if you installed from -a binary package, or <tt class="docutils literal"><span class="pre">/usr/local</span></tt> if you build from source.</p> +<a class="reference internal" href="#command-line-options">Command line options</a>. The first path is the prefix.</p> +<p>On Unix-like systems this is commonly <tt class="docutils literal">/usr</tt> if you installed from +a binary package, or <tt class="docutils literal">/usr/local</tt> if you build from source.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">Editing system files is not necessary as you can use the per-user configuration files instead, which don't need root -permissions. See <a class="reference" href="#configuration-files">Configuration files</a>.</p> +permissions. See <a class="reference internal" href="#configuration-files">Configuration files</a>.</p> </div> </div> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id24" id="usage" name="usage">Usage</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id25" id="getting-started" name="getting-started">Getting started</a></h2> +<div class="section" id="usage"> +<h1><a class="toc-backref" href="#id24">Usage</a></h1> +<div class="section" id="getting-started"> +<h2><a class="toc-backref" href="#id25">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -720,8 +720,8 @@ </li> </ul> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id26" id="the-geany-workspace" name="the-geany-workspace">The Geany workspace</a></h2> +<div class="section" id="the-geany-workspace"> +<h2><a class="toc-backref" href="#id26">The Geany workspace</a></h2> <p>The Geany window is shown in the following figure:</p> <img alt="./images/main_window.png" src="./images/main_window.png" /> <p>The workspace has the following parts:</p> @@ -744,15 +744,15 @@ </li> <li>A status bar</li> </ul> -<p>Most of these can be configured in the <a class="reference" href="#interface-preferences">Interface preferences</a>, the -<a class="reference" href="#view-menu">View menu</a>, or the popup menu for the relevant area.</p> +<p>Most of these can be configured in the <a class="reference internal" href="#interface-preferences">Interface preferences</a>, the +<a class="reference internal" href="#view-menu">View menu</a>, or the popup menu for the relevant area.</p> <p>Additional tabs may be added to the sidebar and message window by plugins.</p> <p>The position of the tabs can be selected in the interface preferences.</p> <p>The sizes of the sidebar and message window can be adjusted by dragging the dividers.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id27" id="command-line-options" name="command-line-options">Command line options</a></h2> +<div class="section" id="command-line-options"> +<h2><a class="toc-backref" href="#id27">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="9%" /> @@ -781,7 +781,7 @@ <td>--config=directory_name</td> <td>Use an alternate configuration directory. The default configuration directory is <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt> and that -is where <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files +is where <tt class="docutils literal">geany.conf</tt> and other configuration files reside.</td> </tr> <tr><td><em>none</em></td> @@ -792,7 +792,7 @@ <tr><td>-g</td> <td>--generate-tags</td> <td>Generate a global tags file (see -<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +<a class="reference internal" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> </tr> <tr><td>-P</td> <td>--no-preprocessing</td> @@ -848,7 +848,7 @@ <td>--no-terminal</td> <td>Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget -at startup. If you do not have <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> installed, +at startup. If you do not have <tt class="docutils literal">libvte.so.4</tt> installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -866,7 +866,7 @@ <td>--vte-lib</td> <td>Specify explicitly the path including filename or only the filename to the VTE library, e.g. -<tt class="docutils literal"><span class="pre">/usr/lib/libvte.so</span></tt> or <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. This option is +<tt class="docutils literal">/usr/lib/libvte.so</tt> or <tt class="docutils literal">libvte.so</tt>. This option is only needed when the auto-detection does not work. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -905,13 +905,13 @@ <p>Geany supports all generic GTK options, a list is available on the help screen.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id28" id="general" name="general">General</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id29" id="startup" name="startup">Startup</a></h3> +<div class="section" id="general"> +<h2><a class="toc-backref" href="#id28">General</a></h2> +<div class="section" id="startup"> +<h3><a class="toc-backref" href="#id29">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog -(see <a class="reference" href="#general-startup-preferences">General Startup preferences</a>). If you specify some +(see <a class="reference internal" href="#general-startup-preferences">General Startup preferences</a>). If you specify some files on the command line, only these files will be opened, but you can find the files from the last session in the file menu under the "Recent files" item. By default this contains the last 10 recently @@ -922,8 +922,8 @@ do not specify any filenames on the command-line, or disable opening files in a running instance using the appropriate command line option.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id30" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> +<div class="section" id="opening-files-from-the-command-line-in-a-running-instance"> +<h3><a class="toc-backref" href="#id30">Opening files from the command-line in a running instance</a></h3> <p>Geany detects if there is an an instance of itself already running and opens files from the command-line in that instance. So, Geany can be used to view and edit files by opening them from other programs @@ -932,22 +932,22 @@ <pre class="literal-block"> geany some_file.foo:55:4 </pre> -<p>This would open the file <tt class="docutils literal"><span class="pre">some_file.foo</span></tt> with the cursor on line 55, +<p>This would open the file <tt class="docutils literal">some_file.foo</tt> with the cursor on line 55, column 4.</p> <p>If you do not like this for some reason, you can disable using the first instance by using the appropriate command line option -- see the section -called <a class="reference" href="#command-line-options">Command line options</a>.</p> +called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id31" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> -<p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> on your system, it is loaded +<div class="section" id="virtual-terminal-emulator-widget-vte"> +<h3><a class="toc-backref" href="#id31">Virtual terminal emulator widget (VTE)</a></h3> +<p>If you have installed <tt class="docutils literal">libvte.so</tt> on your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> -<p>If Geany cannot find any <tt class="docutils literal"><span class="pre">libvte.so</span></tt> at startup, the terminal widget +<p>If Geany cannot find any <tt class="docutils literal">libvte.so</tt> at startup, the terminal widget will not be loaded. So there is no need to install the package containing this file in order to run Geany. Additionally, you can disable the use of the terminal widget by command line option, for more information -see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> +see the section called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> <p>You can use this terminal (from now on called VTE) much as you would a terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -964,26 +964,26 @@ you can use the argument <tt class="docutils literal"><span class="pre">--login</span></tt>.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">Geany tries to load <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. If this fails, it tries to load +<p class="last">Geany tries to load <tt class="docutils literal">libvte.so</tt>. If this fails, it tries to load some other filenames. If this fails too, you should check whether you installed libvte correctly. Again note, Geany will run without this library.</p> </div> <p>It could be, that the library is called something else than -<tt class="docutils literal"><span class="pre">libvte.so</span></tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal"><span class="pre">libvte.so.8</span></tt>). If so +<tt class="docutils literal">libvte.so</tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal">libvte.so.8</tt>). If so please set a link to the correct file (as root):</p> <pre class="literal-block"> # ln -s /usr/lib/libvte.so.X /usr/lib/libvte.so </pre> <p>Obviously, you have to adjust the paths and set X to the number of your -<tt class="docutils literal"><span class="pre">libvte.so</span></tt>.</p> +<tt class="docutils literal">libvte.so</tt>.</p> <p>You can also specify the filename of the VTE library to use on the command -line (see the section called <a class="reference" href="#command-line-options">Command line options</a>) or at compile time +line (see the section called <a class="reference internal" href="#command-line-options">Command line options</a>) or at compile time by specifying the command line option <tt class="docutils literal"><span class="pre">--with-vte-module-path</span></tt> to ./configure.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id32" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section" id="defining-own-widget-styles-using-gtkrc-2-0"> +<h3><a class="toc-backref" href="#id32">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -1023,10 +1023,10 @@ </pre> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id33" id="documents" name="documents">Documents</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id34" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<div class="section" id="documents"> +<h2><a class="toc-backref" href="#id33">Documents</a></h2> +<div class="section" id="switching-between-documents"> +<h3><a class="toc-backref" href="#id34">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -1034,14 +1034,14 @@ (regardless of whether or not editor tabs are visible).</p> <p>The tabs can be positioned at the top, bottom, left, or right of the main editing window, by a selection in the interface preferences.</p> -<p>See the <a class="reference" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful +<p>See the <a class="reference internal" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful shortcuts including for Most-Recently-Used document switching.</p> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id35" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id36" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> +<h2><a class="toc-backref" href="#id35">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<div class="section" id="using-character-sets"> +<h3><a class="toc-backref" href="#id36">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets, and even convert a file from one character set to another. To do this, @@ -1087,8 +1087,8 @@ </li> </ul> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id37" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<div class="section" id="in-file-encoding-specification"> +<h3><a class="toc-backref" href="#id37">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -1115,7 +1115,7 @@ correctly the next time.</p> <p>Since Geany 0.15 you can also use lines which match the regular expression used to find the encoding string: -<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> <span class="pre">]*</span></tt></p> +<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> ]*</tt></p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">These specifications must be in the first 512 bytes of the file. @@ -1130,8 +1130,8 @@ # coding: ISO-8859-15 </pre> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id38" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<div class="section" id="special-encoding-none"> +<h3><a class="toc-backref" href="#id38">Special encoding "None"</a></h3> <p>There is a special encoding "None" which uses no encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -1140,10 +1140,10 @@ of the first NULL-byte. Using this encoding opens the file as it is without any character conversion.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id39" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section" id="unicode-byte-order-mark-bom"> +<h3><a class="toc-backref" href="#id39">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects a Unicode Byte Order Mark (see -<a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, +<a class="reference external" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in a Unicode encoding. The Byte Order Mark helps to detect the encoding of a file, e.g. whether it is UTF-16LE or UTF-16BE and so on. On Unix-like systems @@ -1163,10 +1163,10 @@ </div> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id40" id="editing" name="editing">Editing</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id41" id="folding" name="folding">Folding</a></h3> +<div class="section" id="editing"> +<h2><a class="toc-backref" href="#id40">Editing</a></h2> +<div class="section" id="folding"> +<h3><a class="toc-backref" href="#id41">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -1180,7 +1180,7 @@ <div class="note"> <p class="first admonition-title">Note</p> <p class="last">You can customize the folding icon and line styles - see the -filetypes.common <a class="reference" href="#folding-settings">Folding Settings</a>.</p> +filetypes.common <a class="reference internal" href="#folding-settings">Folding Settings</a>.</p> </div> <p>If you don't like it or don't need it at all, you can simply disable folding support completely in the preferences dialog.</p> @@ -1195,8 +1195,8 @@ children of a fold point" option is enabled, pressing Shift will disable it for this click and vice versa.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id42" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</a></h3> +<div class="section" id="column-mode-editing-rectangular-selections"> +<h3><a class="toc-backref" href="#id42">Column mode editing (rectangular selections)</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control and Shift keys (or Control and Alt if it doesn't work) while @@ -1205,23 +1205,23 @@ this selection and the modifications will be done for every line in the selection.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id43" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> +<div class="section" id="drag-and-drop-of-text"> +<h3><a class="toc-backref" href="#id43">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will copy the text instead. This behaviour was changed in Geany 0.11 - before the selected text was copied to the new position.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id44" id="indentation" name="indentation">Indentation</a></h3> +<div class="section" id="indentation"> +<h3><a class="toc-backref" href="#id44">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character, multiple spaces or a combination of both. The default indent -settings are set in <a class="reference" href="#editor-indentation-preferences">Editor Indentation preferences</a> (see the link +settings are set in <a class="reference internal" href="#editor-indentation-preferences">Editor Indentation preferences</a> (see the link for more information).</p> <p>The default settings can be overridden per-document using the Document menu. They can also be overridden by projects - see -<a class="reference" href="#project-management">Project Management</a>.</p> +<a class="reference internal" href="#project-management">Project Management</a>.</p> <p>The indent mode for the current document is shown on the status bar as follows:</p> <dl class="docutils"> @@ -1233,21 +1233,21 @@ <dd>Indent with tabs and spaces, depending on how much indentation is on a line.</dd> </dl> -<div class="section"> -<h4><a class="toc-backref" href="#id45" id="applying-new-indentation-settings" name="applying-new-indentation-settings">Applying new indentation settings</a></h4> +<div class="section" id="applying-new-indentation-settings"> +<h4><a class="toc-backref" href="#id45">Applying new indentation settings</a></h4> <p>After changing the default settings you may wish to apply the new settings to every document in the current session. To do this use the <em>Project->Apply Default Indentation</em> menu item.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id46" id="detecting-indent-type" name="detecting-indent-type">Detecting indent type</a></h4> +<div class="section" id="detecting-indent-type"> +<h4><a class="toc-backref" href="#id46">Detecting indent type</a></h4> <p>The <em>Detect from file</em> indentation preference can be used to scan each file as it's opened and set the indent type based on how many lines start with a tab vs. 2 or more spaces.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id47" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<div class="section" id="auto-indentation"> +<h3><a class="toc-backref" href="#id47">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -1268,10 +1268,10 @@ </dl> <p>There is also XML-tag auto-indentation. This is enabled when the mode is more than just Basic, and is also controlled by a filetype -setting - see <a class="reference" href="#xml-indent-tags">xml_indent_tags</a>.</p> +setting - see <a class="reference internal" href="#xml-indent-tags">xml_indent_tags</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id48" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<div class="section" id="bookmarks"> +<h3><a class="toc-backref" href="#id48">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -1288,14 +1288,14 @@ (Ctrl-PgUp/PgDn and Ctrl-Tab) provides a particularly fast way to navigate around multiple files.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id49" id="code-navigation-history" name="code-navigation-history">Code navigation history</a></h3> +<div class="section" id="code-navigation-history"> +<h3><a class="toc-backref" href="#id49">Code navigation history</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> <ul class="simple"> -<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li> +<li><a class="reference internal" href="#go-to-tag-declaration">Go to tag declaration</a></li> +<li><a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a></li> <li>Symbol list items</li> <li>Build errors</li> <li>Message items</li> @@ -1307,8 +1307,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id50" id="sending-text-through-custom-commands" name="sending-text-through-custom-commands">Sending text through custom commands</a></h3> +<div class="section" id="sending-text-through-custom-commands"> +<h3><a class="toc-backref" href="#id50">Sending text through custom commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands using the <em>Edit->Format->Send Selection to</em> menu or keybindings. The output of the command will be @@ -1327,22 +1327,22 @@ deleted automatically.</p> <p>Normal shell quoting is supported, so you can do things like:</p> <ul class="simple"> -<li><tt class="docutils literal"><span class="pre">sed</span> <span class="pre">'s/\./(dot)/g'</span></tt></li> +<li><tt class="docutils literal">sed <span class="pre">'s/\./(dot)/g'</span></tt></li> </ul> -<p>The above example would normally be done with the <a class="reference" href="#replace-all">Replace all</a> +<p>The above example would normally be done with the <a class="reference internal" href="#replace-all">Replace all</a> function, but it can be handy to have common commands already set up.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id51" id="context-actions" name="context-actions">Context actions</a></h3> +<div class="section" id="context-actions"> +<h3><a class="toc-backref" href="#id51">Context actions</a></h3> <p>You can execute the context action command on the current word at the cursor position or the available selection. This word or selection can be used as an argument to the command. The context action is invoked by a menu entry in the popup menu of the editor and also a keyboard shortcut (see the section called -<a class="reference" href="#keybindings">Keybindings</a>).</p> +<a class="reference internal" href="#keybindings">Keybindings</a>).</p> <p>The command can be specified in the preferences dialog and also for each filetype (see "context_action_cmd" in the section called -<a class="reference" href="#filetype-configuration">Filetype configuration</a>). When the context action is invoked, the filetype +<a class="reference internal" href="#filetype-configuration">Filetype configuration</a>). When the context action is invoked, the filetype specific command is used if available, otherwise the command specified in the preferences dialog is executed.</p> <p>The current word or selection can be referred with the wildcard "%s" @@ -1357,19 +1357,19 @@ <p>when executing the command, the %s is substituted by the word near the cursor position or by the current selection. If the cursor is at the word "echo", a browser window will open(assumed your browser is -called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> +called firefox) and it will open the address: <a class="reference external" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id52" id="autocompletion" name="autocompletion">Autocompletion</a></h3> +<div class="section" id="autocompletion"> +<h3><a class="toc-backref" href="#id52">Autocompletion</a></h3> <p>Geany can offer a list of possible completions for symbols defined in the tags and for all words in a document.</p> <p>The autocompletion list for symbols is presented when the first few -characters of the symbol are typed (configurable, see <a class="reference" href="#editor-completions-preferences">Editor Completions +characters of the symbol are typed (configurable, see <a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>, default 4) or when the <em>Complete word</em> -keybinding is pressed (configurable, see <a class="reference" href="#editor-keybindings">Editor keybindings</a>, +keybinding is pressed (configurable, see <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>, default Ctrl-Space).</p> <p>When the defined keybinding is typed and the <em>Autocomplete all words in -document</em> preference (in <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>) +document</em> preference (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>) is selected then the autocompletion list will show all matching words in the document, if there are no matching symbols.</p> <p>If you don't want to use autocompletion it can be dismissed until @@ -1381,13 +1381,13 @@ item on the autocompletion list can be chosen from the list by pressing Enter/Return. You can also double-click to select an item. The sequence will be completed to match the chosen item, and if the <em>Drop rest of -word on completion</em> preference is set (in <a class="reference" href="#editor-completions-preferences">Editor Completions +word on completion</em> preference is set (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>) then any characters after the cursor that match a symbol or word are deleted.</p> -<div class="section"> -<h4><a class="toc-backref" href="#id53" id="word-part-completion" name="word-part-completion">Word part completion</a></h4> +<div class="section" id="word-part-completion"> +<h4><a class="toc-backref" href="#id53">Word part completion</a></h4> <p>By default, pressing Tab will complete the selected item by word part; -useful e.g. for adding the prefix <tt class="docutils literal"><span class="pre">gtk_combo_box_entry_</span></tt> without typing it +useful e.g. for adding the prefix <tt class="docutils literal">gtk_combo_box_entry_</tt> without typing it manually:</p> <ul class="simple"> <li>gtk_com<TAB></li> @@ -1396,12 +1396,12 @@ <li>gtk_combo_box_entry_<s><ENTER></li> <li>gtk_combo_box_entry_set_text_column</li> </ul> -<p>The key combination can be changed from Tab - See <a class="reference" href="#editor-keybindings">Editor keybindings</a>. +<p>The key combination can be changed from Tab - See <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>. If you clear/change the key combination for word part completion, Tab will complete the whole word instead, like Enter.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id54" id="scope-autocompletion" name="scope-autocompletion">Scope autocompletion</a></h4> +<div class="section" id="scope-autocompletion"> +<h4><a class="toc-backref" href="#id54">Scope autocompletion</a></h4> <p>E.g.:</p> <pre class="literal-block"> struct @@ -1410,7 +1410,7 @@ char c; } foo; </pre> -<p>When you type <tt class="docutils literal"><span class="pre">foo.</span></tt> it will show an autocompletion list with 'i' and +<p>When you type <tt class="docutils literal">foo.</tt> it will show an autocompletion list with 'i' and 'c' symbols.</p> <p>It only works for languages that set parent scope names for e.g. struct members. Currently this means C-like languages. The C tag parser only @@ -1418,39 +1418,39 @@ in local scope.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id55" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<div class="section" id="user-definable-snippets"> +<h3><a class="toc-backref" href="#id55">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time when typing common strings and letting Geany do the work for you. To know what to complete or replace Geany reads a configuration file -called <tt class="docutils literal"><span class="pre">snippets.conf</span></tt> at startup.</p> +called <tt class="docutils literal">snippets.conf</tt> at startup.</p> <p>Maybe you need to often type your name, so define a snippet like this:</p> <pre class="literal-block"> [Default] myname=Enrico Tröger </pre> -<p>Every time you write <tt class="docutils literal"><span class="pre">myname</span></tt> <TAB> in Geany, it will replace "myname" +<p>Every time you write <tt class="docutils literal">myname</tt> <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start autocompletion can be changed in the preferences dialog, by default it is TAB. The corresponding keybinding is called <cite>Complete snippet</cite>.</p> <p><strong>Paths</strong></p> <p>You can override the default snippets using the user -<tt class="docutils literal"><span class="pre">snippets.conf</span></tt> file. Use the <em>Tools->Configuration @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5799] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5799 http://geany.svn.sourceforge.net/geany/?rev=5799&view=rev Author: statc Date: 2011-05-21 08:40:22 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5522..5530) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/README branches/sm/README.Packagers branches/sm/THANKS branches/sm/configure.ac branches/sm/data/filetypes.javascript branches/sm/doc/geany.1.in branches/sm/doc/geany.txt branches/sm/doc/making-a-release branches/sm/doc/plugins.dox branches/sm/doc/pluginsignals.c branches/sm/doc/pluginsymbols.c branches/sm/geany.nsi branches/sm/geany_private.rc branches/sm/plugins/classbuilder.c branches/sm/plugins/demoplugin.c branches/sm/plugins/export.c branches/sm/plugins/filebrowser.c branches/sm/plugins/geanyplugin.h branches/sm/plugins/genapi.py branches/sm/plugins/htmlchars.c branches/sm/plugins/saveactions.c branches/sm/plugins/splitwindow.c branches/sm/po/ChangeLog branches/sm/po/pt_BR.po branches/sm/scripts/changelist.pl branches/sm/scripts/fix-alignment.pl branches/sm/scripts/plugin_test.c branches/sm/src/about.c branches/sm/src/about.h branches/sm/src/build.c branches/sm/src/build.h branches/sm/src/callbacks.c branches/sm/src/callbacks.h branches/sm/src/dialogs.c branches/sm/src/dialogs.h branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/documentprivate.h branches/sm/src/editor.c branches/sm/src/editor.h branches/sm/src/encodings.c branches/sm/src/encodings.h branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/filetypesprivate.h branches/sm/src/gb.c branches/sm/src/geany.h branches/sm/src/geanyentryaction.c branches/sm/src/geanyentryaction.h branches/sm/src/geanymenubuttonaction.c branches/sm/src/geanymenubuttonaction.h branches/sm/src/geanyobject.c branches/sm/src/geanyobject.h branches/sm/src/geanywraplabel.c branches/sm/src/geanywraplabel.h branches/sm/src/highlighting.c branches/sm/src/highlighting.h branches/sm/src/images.c branches/sm/src/keybindings.c branches/sm/src/keybindings.h branches/sm/src/keyfile.c branches/sm/src/keyfile.h branches/sm/src/log.c branches/sm/src/log.h branches/sm/src/main.c branches/sm/src/main.h branches/sm/src/msgwindow.c branches/sm/src/msgwindow.h branches/sm/src/navqueue.c branches/sm/src/navqueue.h branches/sm/src/notebook.c branches/sm/src/notebook.h branches/sm/src/plugindata.h branches/sm/src/pluginprivate.h branches/sm/src/plugins.c branches/sm/src/plugins.h branches/sm/src/pluginutils.c branches/sm/src/pluginutils.h branches/sm/src/prefs.c branches/sm/src/prefs.h branches/sm/src/printing.c branches/sm/src/printing.h branches/sm/src/project.c branches/sm/src/project.h branches/sm/src/projectprivate.h branches/sm/src/sciwrappers.c branches/sm/src/sciwrappers.h branches/sm/src/search.c branches/sm/src/search.h branches/sm/src/sidebar.c branches/sm/src/sidebar.h branches/sm/src/socket.c branches/sm/src/socket.h branches/sm/src/stash.c branches/sm/src/stash.h branches/sm/src/support.h branches/sm/src/symbols.c branches/sm/src/symbols.h branches/sm/src/templates.c branches/sm/src/templates.h branches/sm/src/toolbar.c branches/sm/src/toolbar.h branches/sm/src/tools.c branches/sm/src/tools.h branches/sm/src/ui_utils.c branches/sm/src/ui_utils.h branches/sm/src/utils.c branches/sm/src/utils.h branches/sm/src/vte.c branches/sm/src/vte.h branches/sm/src/win32.c branches/sm/src/win32.h branches/sm/tagmanager/nestlevel.c branches/sm/tagmanager/nestlevel.h branches/sm/tagmanager/nsis.c branches/sm/tagmanager/rest.c branches/sm/win32-config.h branches/sm/wscript Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/ChangeLog 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,3 +1,34 @@ +2011-01-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/filebrowser.c: + Add '.pyc' to the list of hidden object files + (patch by Filip Gruszczyński, thanks). + + +2011-01-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * *.*: + Update copyright information. + * configure.ac, doc/geany.html, doc/geany.txt, geany.nsi, + geany_private.rc, win32-config.h, wscript, src/geany.h: + Post-release version bump. + + +2011-01-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/highlighting.c, data/filetypes.javascript: + Add and use secondary keywords for filetype JavaScript, + update and sanitize JavaScript keyword lists + (patch by Jason Oster, thank you). + + +2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * THANKS, src/about.c: + Added Rafael Peregrino da Silva to list of contributors for Brazilian + Portuguese (pt_BR) translation. + + 2011-01-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/toolbar.c, src/ui_utils.c, src/about.c, THANKS: Modified: branches/sm/README =================================================================== --- branches/sm/README 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/README 2011-05-21 08:40:22 UTC (rev 5799) @@ -102,7 +102,7 @@ -- -2005-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2005-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de Modified: branches/sm/README.Packagers =================================================================== --- branches/sm/README.Packagers 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/README.Packagers 2011-05-21 08:40:22 UTC (rev 5799) @@ -82,7 +82,7 @@ -- -2008-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2008-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de Modified: branches/sm/THANKS =================================================================== --- branches/sm/THANKS 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/THANKS 2011-05-21 08:40:22 UTC (rev 5799) @@ -130,6 +130,7 @@ Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR +Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br - pt_BR Alex Eftimie <alex(at)rosedu(dot)org> - ro brahmann_ <brahmann(at)pisem(dot)net> - ru_RU Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru_RU Modified: branches/sm/configure.ac =================================================================== --- branches/sm/configure.ac 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/configure.ac 2011-05-21 08:40:22 UTC (rev 5799) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(geany, 0.20) +AM_INIT_AUTOMAKE(geany, 0.21) AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) Modified: branches/sm/data/filetypes.javascript =================================================================== --- branches/sm/data/filetypes.javascript 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/data/filetypes.javascript 2011-05-21 08:40:22 UTC (rev 5799) @@ -26,8 +26,8 @@ [keywords] # all items must be in one line -primary=break case catch const continue delete else eval false finally for function if in try instanceof isFinite isNaN NaN new null return switch this throw true typeof undefined var while with default let -secondary=Object Function Array prototype +primary=break case catch const continue default delete do each else false finally for function get if in Infinity instanceof let NaN new null return set switch this throw true try typeof undefined var void while with yield +secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt [settings] # default extension used when saving files Modified: branches/sm/doc/geany.1.in =================================================================== --- branches/sm/doc/geany.1.in 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/geany.1.in 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "June 12, 2010" "geany @VERSION@" "" +.TH "GEANY" "1" "January 06, 2011" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: branches/sm/doc/geany.txt =================================================================== --- branches/sm/doc/geany.txt 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/geany.txt 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.20 +.. |(version)| replace:: 0.21 ======= Geany @@ -14,7 +14,7 @@ :Date: $Date$ :Version: |(version)| -Copyright © 2005-2010 +Copyright © 2005-2011 This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 Modified: branches/sm/doc/making-a-release =================================================================== --- branches/sm/doc/making-a-release 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/making-a-release 2011-05-21 08:40:22 UTC (rev 5799) @@ -6,6 +6,8 @@ Ensure version numbers are all updated in: configure.ac geany.nsi geany_private.rc win32-config.h wscript doc/geany.txt +Ensure release date is updated in: + doc/geany.1.in Regenerate doc/geany.html. Check GEANY_CODENAME is set in src/geany.h. Update NEWS & release date. Modified: branches/sm/doc/plugins.dox =================================================================== --- branches/sm/doc/plugins.dox 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/plugins.dox 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,9 +1,9 @@ /* * plugins.dox - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/doc/pluginsignals.c =================================================================== --- branches/sm/doc/pluginsignals.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/pluginsignals.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * pluginsignals.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/doc/pluginsymbols.c =================================================================== --- branches/sm/doc/pluginsymbols.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/doc/pluginsymbols.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * pluginsymbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/geany.nsi =================================================================== --- branches/sm/geany.nsi 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/geany.nsi 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; geany.nsi - this file is part of Geany, a fast and lightweight IDE ; -; Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -; Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +; Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +; Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> ; ; This program is free software; you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by @@ -33,8 +33,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.20" -!define PRODUCT_VERSION_ID "0.20.0.0" +!define PRODUCT_VERSION "0.21" +!define PRODUCT_VERSION_ID "0.21.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" @@ -51,7 +51,7 @@ VIAddVersionKey "ProductName" "${PRODUCT_NAME}" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "LegalCopyright" "Copyright 2005-2010 by the Geany developer team" +VIAddVersionKey "LegalCopyright" "Copyright 2005-2011 by the Geany developer team" VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" BrandingText "$(^NAME) installer (NSIS 2.46)" Modified: branches/sm/geany_private.rc =================================================================== --- branches/sm/geany_private.rc 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/geany_private.rc 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 0,20,0,0 -#define VER_FILEVERSION_STR "0.20" +#define VER_FILEVERSION 0,21,0,0 +#define VER_FILEVERSION_STR "0.21" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" @@ -21,7 +21,7 @@ VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileDescription", "Geany" VALUE "InternalName", "Geany" - VALUE "LegalCopyright", "Copyright 2005-2010 by the Geany developers" + VALUE "LegalCopyright", "Copyright 2005-2011 by the Geany developers" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "Geany.exe" VALUE "ProductName", "Geany" Modified: branches/sm/plugins/classbuilder.c =================================================================== --- branches/sm/plugins/classbuilder.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/classbuilder.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -2,8 +2,8 @@ * classbuilder.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/demoplugin.c =================================================================== --- branches/sm/plugins/demoplugin.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/demoplugin.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * demoplugin.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/export.c =================================================================== --- branches/sm/plugins/export.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/export.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * export.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * filebrowser.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -139,7 +139,7 @@ if (hide_object_files) { - const gchar *exts[] = {".o", ".obj", ".so", ".dll", ".a", ".lib"}; + const gchar *exts[] = {".o", ".obj", ".so", ".dll", ".a", ".lib", ".pyc"}; guint i, exts_len; exts_len = G_N_ELEMENTS(exts); Modified: branches/sm/plugins/geanyplugin.h =================================================================== --- branches/sm/plugins/geanyplugin.h 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/geanyplugin.h 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * geanyplugin.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/genapi.py =================================================================== --- branches/sm/plugins/genapi.py 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/genapi.py 2011-05-21 08:40:22 UTC (rev 5799) @@ -3,8 +3,8 @@ # # genapi.py - this file is part of Geany, a fast and lightweight IDE # -# Copyright 2008-2010 Nick Treleaven <nick.treleaven<at>btinternet.com> -# Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2008-2011 Nick Treleaven <nick.treleaven<at>btinternet.com> +# Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/htmlchars.c =================================================================== --- branches/sm/plugins/htmlchars.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/htmlchars.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,9 +1,9 @@ /* * htmlchars.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/saveactions.c =================================================================== --- branches/sm/plugins/saveactions.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/saveactions.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * saveactions.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/plugins/splitwindow.c =================================================================== --- branches/sm/plugins/splitwindow.c 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/plugins/splitwindow.c 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,8 +1,8 @@ /* * splitwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/po/ChangeLog 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,3 +1,20 @@ +2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * pt_BR.po: Update of Brasilian Portuguese translation. + Thanks to Rafael Peregrino da Silva. + + +2011-01-10 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * pt_BR.po: Update of Brasilian Portuguese translation. + Thanks to Rafael Peregrino da Silva. + + +2011-01-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * New release: Geany 0.20 "Disra". + + 2011-01-04 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * it.po: Small update of Italian translation. Fixes #3147995 Modified: branches/sm/po/pt_BR.po =================================================================== --- branches/sm/po/pt_BR.po 2011-05-17 20:35:27 UTC (rev 5798) +++ branches/sm/po/pt_BR.po 2011-05-21 08:40:22 UTC (rev 5799) @@ -1,16 +1,18 @@ # Portuguese translations for PACKAGE package. -# Copyright (C) 2006-2010 GEANY'S COPYRIGHT HOLDER +# Copyright (C) 2006-2011 GEANY'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Alexandre Moreira <alexandream(a)gmail.com&>, 2006 -# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2010. +# Alexandre Moreira <alexandream(a)gmail.com>, 2006 +# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2010 +# Rafael Peregrino da Silva <rperegrino(a)linuxmagazine.com.br>, 2011 # msgid "" msgstr "" -"Project-Id-Version: Geany 0.19\n" +"Project-Id-Version: Geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-05 15:55+0100\n" -"PO-Revision-Date: 2010-06-01 19:47-0300\n" -"Last-Translator: Adrovane Marques Kade <adrovane(a)gmail.com>\n" +"POT-Creation-Date: 2011-01-11 20:15+0100\n" +"PO-Revision-Date: 2011-01-10 20:14-0300\n" +"Last-Translator: Rafael Peregrino da Silva <rperegrino(a)linuxmagazine.com." +"br>\n" "Language-Team: Portuguese <geany-i18n(a)uvena.de>\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -22,7 +24,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Um IDE rápido e leve usando GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:309 ../src/interface.c:1806 +#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -30,53 +32,53 @@ msgid "Integrated Development Environment" msgstr "Ambiente de Desenvolvimento Integrado" -#: ../src/about.c:152 +#: ../src/about.c:154 msgid "About Geany" msgstr "Sobre o Geany" -#: ../src/about.c:202 +#: ../src/about.c:204 msgid "A fast and lightweight IDE" msgstr "Um IDE rápido e leve" -#: ../src/about.c:223 +#: ../src/about.c:225 #, c-format msgid "(built on or after %s)" msgstr "(construído em %s ou após)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:254 +#: ../src/about.c:256 msgid "Info" msgstr "Informações" -#: ../src/about.c:270 +#: ../src/about.c:272 msgid "Developers" msgstr "Desenvolvedores" -#: ../src/about.c:279 +#: ../src/about.c:281 msgid "maintainer" msgstr "Mantenedor" -#: ../src/about.c:287 +#: ../src/about.c:289 msgid "developer" msgstr "desenvolvedor" -#: ../src/about.c:295 +#: ../src/about.c:297 msgid "translation maintainer" msgstr "mantenedor de traduções" -#: ../src/about.c:304 +#: ../src/about.c:306 msgid "Translators" msgstr "Tradutores" -#: ../src/about.c:324 +#: ../src/about.c:326 msgid "Previous Translators" msgstr "Tradutores anteriores" -#: ../src/about.c:345 +#: ../src/about.c:347 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:355 +#: ../src/about.c:357 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -84,15 +86,15 @@ "Alguns dos muitos colaboradores (para uma lista detalhada, veja o arquivo " "%s):" -#: ../src/about.c:381 +#: ../src/about.c:383 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:395 +#: ../src/about.c:397 msgid "License" msgstr "Licença" -#: ../src/about.c:404 +#: ../src/about.c:406 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -115,29 +117,29 @@ msgid "%s (in directory: %s)" msgstr "%s (no diretório: %s)" -#: ../src/build.c:739 ../src/build.c:964 ../src/search.c:1486 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1486 #, c-format msgid "Process failed (%s)" msgstr "Processo falhou (%s)" -#: ../src/build.c:810 +#: ../src/build.c:807 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Falha ao alterar o diretório atual para %s" -#: ../src/build.c:839 +#: ../src/build.c:836 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Falha ao executar %s (script de inicialização não pôde ser criado)" -#: ../src/build.c:893 +#: ../src/build.c:890 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Não é possível executar o arquivo no VTE porque ele provavelmente contém um " "comando." -#: ../src/build.c:931 +#: ../src/build.c:928 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -146,84 +148,80 @@ "Não foi possível encontrar terminal '%s' (verifique o caminho para o " "Terminal nas Preferências)" -#: ../src/build.c:1104 +#: ../src/build.c:1101 msgid "Compilation failed." msgstr "Compilação falhou." -#: ../src/build.c:1118 +#: ../src/build.c:1115 msgid "Compilation finished successfully." msgstr "Compilação terminada com sucesso." -#: ../src/build.c:1277 +#: ../src/build.c:1274 msgid "Custom Text" msgstr "Texto Personalizado" -#: ../src/build.c:1278 +#: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Insira o texto personalizado aqui. Todo o texto digitado será anexado ao " "comando." -#: ../src/build.c:1356 +#: ../src/build.c:1353 msgid "_Next Error" msgstr "_Próximo Erro" -#: ../src/build.c:1358 +#: ../src/build.c:1355 msgid "_Previous Error" msgstr "Erro _Anterior" -#: ../src/build.c:1368 +#: ../src/build.c:1365 msgid "_Set Build Commands" msgstr "Definir Comando_s de Construção" -#: ../src/build.c:1652 ../src/toolbar.c:373 +#: ../src/build.c:1649 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Constrói o arquivo atual" -#: ../src/build.c:1666 +#: ../src/build.c:1663 msgid "Build the current file with Make and the default target" msgstr "Constrói o arquivo atual com a ferramenta make e o destino padrão" -#: ../src/build.c:1668 +#: ../src/build.c:1665 msgid "Build the current file with Make and the specified target" msgstr "" "Constrói o arquivo atual com a ferramenta make e o destino especificado" -#: ../src/build.c:1670 +#: ../src/build.c:1667 msgid "Compile the current file with Make" msgstr "Compila o arquivo atual com o Make" -#: ../src/build.c:1697 +#: ../src/build.c:1694 #, c-format msgid "Process could not be stopped (%s)." msgstr "O processo não pôde ser parado (%s)." -#: ../src/build.c:1714 ../src/build.c:1726 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "Não há mais erros de construção." #. FIXME: we should pass either build dialog or project dialog instead of NULL for parent -#: ../src/build.c:1822 +#: ../src/build.c:1819 msgid "Set menu item label" msgstr "Definir rótulo de item de menu" -#: ../src/build.c:1847 -msgid "Item" -msgstr "Item" - -#: ../src/build.c:1848 ../src/symbols.c:650 +#: ../src/build.c:1845 ../src/symbols.c:650 msgid "Label" msgstr "Rótulo" -#: ../src/build.c:1849 ../src/symbols.c:645 +#: ../src/build.c:1846 ../src/symbols.c:645 msgid "Command" msgstr "Comando" -#: ../src/build.c:1850 +#: ../src/build.c:1847 msgid "Working directory" msgstr "Diretório de trabalho" -#: ../src/build.c:1851 +#: ../src/build.c:1848 msgid "Clear" msgstr "Limpar" @@ -245,19 +243,18 @@ msgstr "Expressão Regular de Erro:" #: ../src/build.c:2013 -#, fuzzy msgid "Independent Commands" -msgstr "Comandos Não Tipo de Arquivo" +msgstr "Comandos Independentes" -#: ../src/build.c:2043 +#: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "Nota: o item 2 abre um diálogo e anexa a resposta ao comando." -#: ../src/build.c:2052 +#: ../src/build.c:2054 msgid "Execute Commands" msgstr "Executar Comandos" -#: ../src/build.c:2063 +#: ../src/build.c:2066 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " @@ -266,44 +263,44 @@ "%d, %e, %f, %p são substituídos nos campos de comando e diretório. Veja o " "manual para detalhes." -#: ../src/build.c:2223 +#: ../src/build.c:2226 msgid "Set Build Commands" msgstr "Definir Comandos de Construir" -#: ../src/build.c:2434 +#: ../src/build.c:2437 msgid "_Compile" msgstr "_Compilar" #. build the code -#: ../src/build.c:2441 ../src/build.c:2703 ../src/interface.c:1218 +#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 msgid "_Build" msgstr "C_onstruir" -#: ../src/build.c:2448 ../src/build.c:2478 ../src/build.c:2671 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 msgid "_Execute" msgstr "_Executar" #. build the code with make custom -#: ../src/build.c:2493 ../src/build.c:2669 ../src/build.c:2723 +#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Make _Destino Personalizado" #. build the code with make object -#: ../src/build.c:2495 ../src/build.c:2670 ../src/build.c:2731 +#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 msgid "Make _Object" msgstr "Make O_bjeto" -#: ../src/build.c:2497 ../src/build.c:2668 +#: ../src/build.c:2500 ../src/build.c:2671 msgid "_Make" msgstr "_Make" #. build the code with make all -#: ../src/build.c:2715 +#: ../src/build.c:2718 msgid "_Make All" msgstr "_Make All" #. arguments -#: ../src/build.c:2743 +#: ../src/build.c:2746 msgid "_Set Build Menu Commands" msgstr "Definir Comando_s do Menu Construir" @@ -318,7 +315,7 @@ msgstr[0] "%d arquivo salvo." msgstr[1] "%d arquivos salvos." -#: ../src/callbacks.c:490 ../src/document.c:2996 ../src/interface.c:380 +#: ../src/callbacks.c:490 ../src/document.c:2999 ../src/interface.c:381 #: ../src/sidebar.c:683 msgid "_Reload" msgstr "Recarre_gar" @@ -332,7 +329,7 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Tem certeza de que deseja recarregar '%s'?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:424 +#: ../src/callbacks.c:1196 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Ir para Linha" @@ -397,32 +394,27 @@ msgid "No more message items." msgstr "Não há mais itens de mensagens." -#: ../src/dialogs.c:178 ../src/interface.c:3873 ../src/interface.c:5492 +#: ../src/dialogs.c:178 ../src/interface.c:3909 ../src/interface.c:5532 msgid "Detect from file" msgstr "Detectar a partir do arquivo" #: ../src/dialogs.c:181 -#, fuzzy msgid "West European" msgstr "Europeu _Ocidental" #: ../src/dialogs.c:183 -#, fuzzy msgid "East European" msgstr "Europeu O_riental" #: ../src/dialogs.c:185 -#, fuzzy msgid "East Asian" msgstr "Asiático Or_iental" #: ../src/dialogs.c:187 -#, fuzzy msgid "SE & SW Asian" -msgstr "Asiático _SE e SO" +msgstr "Sudeste e Sodoeste Asiático" #: ../src/dialogs.c:189 -#, fuzzy msgid "Middle Eastern" msgstr "Oriente _Médio" @@ -436,7 +428,7 @@ msgid "Open File" msgstr "Abrir Arquivo" -#: ../src/dialogs.c:243 ../src/interface.c:868 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "E_xibir" @@ -718,9 +710,9 @@ #: ../src/document.c:1195 #, c-format msgid "Setting %s indentation mode for %s." -msgstr "Definindo %s modo de endentação para %s." +msgstr "Definindo %s modo de recuo para %s." -#: ../src/document.c:1248 +#: ../src/document.c:1248 ../src/document.c:1858 msgid "Invalid filename" msgstr "Nome de arquivo inválido" @@ -771,67 +763,70 @@ #: ../src/document.c:1743 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "" +msgstr "Erro na abertura do arquivo '%s' para escrita: falha do fopen(): %s" #: ../src/document.c:1761 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "" +msgstr "Erro armazenando o arquivo '%s': falha do fwrite(): %s" #: ../src/document.c:1775 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "" +msgstr "Erro ao fechar o arquivo '%s': falha do fclose(): %s" -#: ../src/document.c:1855 ../src/document.c:1927 -msgid "Error saving file." -msgstr "Erro ao salvar arquivo." - -#: ../src/document.c:1920 +#: ../src/document.c:1858 ../src/document.c:1923 #, c-format msgid "Error saving file (%s)." msgstr "Erro ao salvar arquivo (%s)." -#: ../src/document.c:1925 +#: ../src/document.c:1928 #, c-format msgid "" "%s\n" "\n" "The file on disk may now be truncated!" msgstr "" +"%s\n" +"\n" +"O arquivo em disco agora pode estar truncado!" -#: ../src/document.c:1951 +#: ../src/document.c:1930 +msgid "Error saving file." +msgstr "Erro ao salvar arquivo." + +#: ../src/document.c:1954 #, c-format msgid "File %s saved." msgstr "Arquivo %s salvo." -#: ../src/document.c:2019 ../src/document.c:2076 ../src/document.c:2084 +#: ../src/document.c:2022 ../src/document.c:2079 ../src/document.c:2087 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" não foi encontrado." -#: ../src/document.c:2084 +#: ../src/document.c:2087 msgid "Wrap search and find again?" msgstr "Circular pesquisa e procurar novamente?" -#: ../src/document.c:2163 ../src/search.c:1146 ../src/search.c:1190 +#: ../src/document.c:2166 ../src/search.c:1146 ../src/search.c:1190 #: ../src/search.c:1882 ../src/search.c:1883 #, c-format msgid "No matches found for \"%s\"." msgstr "Nenhuma combinação encontrada para '%s'." -#: ../src/document.c:2174 ../src/document.c:2183 +#: ../src/document.c:2177 ../src/document.c:2186 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d ocorrência de \"%s\" substituída por \"%s\"." msgstr[1] "%s: %d ocorrências de \"%s\" substituídas por \"%s\"." -#: ../src/document.c:2997 +#: ../src/document.c:3000 msgid "Do you want to reload it?" msgstr "Deseja recarregá-lo?" -#: ../src/document.c:2998 +#: ../src/document.c:3001 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -840,20 +835,18 @@ "O arquivo '%s' que está no disco é \n" "mais recente do que o buffer atual." -#: ../src/document.c:3016 +#: ../src/document.c:3019 msgid "Close _without saving" msgstr "Fechar sem salvar (_W)" -#: ../src/document.c:3019 +#: ../src/document.c:3022 msgid "Try to resave the file?" msgstr "Tentar salvar novamente o arquivo?" -#: ../src/document.c:3020 -#, fuzzy, c-format +#: ../src/document.c:3023 +#, c-format msgid "File \"%s\" was not found on disk!" -msgstr "" -"O arquivo \"%s\" não foi encontrado no disco! Tentar novamente salvar o " -"arquivo?" +msgstr "O arquivo \"%s\" não foi encontrado no disco!" #: ../src/editor.c:4326 msgid "Enter Tab Width" @@ -1009,8 +1002,8 @@ msgid "%s file" msgstr "Arquivo %s" -#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3816 -#: ../src/interface.c:5435 +#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3852 +#: ../src/interface.c:5475 msgid "None" msgstr "Nenhum" @@ -1086,7 +1079,7 @@ msgid "untitled" msgstr "sem título" -#: ../src/highlighting.c:3595 ../src/main.c:814 ../src/socket.c:165 +#: ../src/highlighting.c:3595 ../src/main.c:815 ../src/socket.c:165 #: ../src/templates.c:315 #, c-format msgid "Could not find file '%s'." @@ -1100,555 +1093,550 @@ msgid "_Color Schemes" msgstr "Esquemas de _Cores" -#: ../src/interface.c:323 +#: ../src/interface.c:324 msgid "_File" msgstr "_Arquivo" -#: ../src/interface.c:334 +#: ../src/interface.c:335 msgid "New (with _Template)" msgstr "No_vo (com Template)" -#: ../src/interface.c:351 ../src/interface.c:2332 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "A_brir Arquivo Selecionado" -#: ../src/interface.c:355 +#: ../src/interface.c:356 msgid "Recent _Files" msgstr "Arquivos _Recentes" -#: ../src/interface.c:372 +#: ../src/interface.c:373 msgid "Save A_ll" msgstr "Sa_lvar Tudo" -#: ../src/interface.c:388 +#: ../src/interface.c:389 msgid "R_eload As" msgstr "R_ecarregar Como" -#: ../src/interface.c:399 ../src/interface.c:634 ../src/interface.c:693 -#: ../src/interface.c:707 ../src/interface.c:1083 ../src/interface.c:1093 -#: ../src/interface.c:2297 ../src/interface.c:2311 +#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 +#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 +#: ../src/interface.c:2311 ../src/interface.c:2325 msgid "invisible" msgstr "invisível" -#: ../src/interface.c:416 +#: ../src/interface.c:417 msgid "Page Set_up" msgstr "Config_urar página" -#: ../src/interface.c:433 ../src/notebook.c:214 +#: ../src/interface.c:434 ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "Fec_har Outros Documentos" -#: ../src/interface.c:441 ../src/notebook.c:219 +#: ../src/interface.c:442 ../src/notebook.c:262 msgid "C_lose All" msgstr "Fechar T_udo" -#: ../src/interface.c:458 ../src/interface.c:2231 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:508 +#: ../src/interface.c:509 msgid "_Commands" msgstr "_Comandos" -#: ../src/interface.c:515 ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Re_cortar Linha(s) Atual(is)" -#: ../src/interface.c:523 ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "_Copiar Linha(s) Atual(is)" -#: ../src/interface.c:531 ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "_Deletar Linha(s) Atual(is)" -#: ../src/interface.c:535 ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Duplicar Linha ou Seleção" -#: ../src/interface.c:544 ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "_Selecionar Linha(s) Atual(is)" -#: ../src/interface.c:548 ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "_Selecionar Parágrafo Atual" -#: ../src/interface.c:557 ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Enviar Seleção para o Terminal" -#: ../src/interface.c:561 ../src/interface.c:2235 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "_Formatar" -#: ../src/interface.c:568 ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Refluir Linhas/Bloco" -#: ../src/interface.c:572 ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "A_lterar maiúsculas/minúsculas da seleção" -#: ../src/interface.c:576 ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "_Transpor linha atual" -#: ../src/interface.c:585 +#: ../src/interface.c:586 msgid "_Comment Line(s)" msgstr "_Comentar Linha(s)" -#: ../src/interface.c:589 +#: ../src/interface.c:590 msgid "U_ncomment Line(s)" msgstr "_Descomentar Linha(s)" -#: ../src/interface.c:593 +#: ../src/interface.c:594 msgid "_Toggle Line Commentation" msgstr "A_lternar Comentário de Linha" -#: ../src/interface.c:602 +#: ../src/interface.c:603 msgid "_Increase Indent" -msgstr "Aumen_tar Endentação" +msgstr "Aumen_tar Recuo" -#: ../src/interface.c:610 +#: ../src/interface.c:611 msgid "_Decrease Indent" -msgstr "Dimi_nuir Endentação" +msgstr "Dimi_nuir Recuo" -#: ../src/interface.c:618 ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 msgid "_Smart Line Indent" -msgstr "Endentação Inteligente de Linha_s" +msgstr "Recuo Inteligente de Linha_s" -#: ../src/interface.c:627 +#: ../src/interface.c:628 msgid "_Send Selection to" msgstr "_Enviar Seleção para" -#: ../src/interface.c:642 +#: ../src/interface.c:643 msgid "I_nsert Comments" msgstr "I_nserir Comentários" -#: ../src/interface.c:653 ../src/interface.c:2246 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "Inserir Entrada de _ChangeLog" -#: ../src/interface.c:657 ../src/interface.c:2250 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "Inserir Descrição de _Função" -#: ../src/interface.c:661 ../src/interface.c:2254 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "Inserir Comentário _Multilinha" -#: ../src/interface.c:670 ../src/interface.c:2269 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "Inserir Cabeçal_ho de Arquivo" -#: ../src/interface.c:674 ../src/interface.c:2273 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "Inserir Advertência da _GPL" -#: ../src/interface.c:678 ../src/interface.c:2277 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "Inserir Advertência de Licença _BSD" -#: ../src/interface.c:682 ../src/interface.c:2286 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "Ins_erir Data" -#: ../src/interface.c:696 ../src/interface.c:2300 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "_Inserir \"include <...>\"" -#: ../src/interface.c:715 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +msgid "_Insert Alternative White Space" +msgstr "_Inserir Espaço em Branco Alternativo" + +#: ../src/interface.c:720 msgid "Preference_s" msgstr "Preferência_s" -#: ../src/interface.c:723 ../src/keybindings.c:386 +#: ../src/interface.c:728 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Preferências de P_lugins" -#: ../src/interface.c:731 ../src/interface.c:2323 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "Pe_squisar" -#: ../src/interface.c:742 +#: ../src/interface.c:747 msgid "Find _Next" msgstr "Localizar _Próximo" -#: ../src/interface.c:746 +#: ../src/interface.c:751 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../src/interface.c:755 +#: ../src/interface.c:760 msgid "Find in F_iles" msgstr "Localizar em Ar_quivos" -#: ../src/interface.c:763 ../src/search.c:562 +#: ../src/interface.c:768 ../src/search.c:562 msgid "_Replace" msgstr "Substitui_r" -#: ../src/interface.c:776 +#: ../src/interface.c:781 msgid "Next _Message" msgstr "Próxima _Mensagem" -#: ../src/interface.c:784 +#: ../src/interface.c:789 msgid "Pr_evious Message" msgstr "M_ensagem Prévia" -#: ../src/interface.c:797 ../src/keybindings.c:433 +#: ../src/interface.c:802 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Ir Para o _Próximo Marcador" -#: ../src/interface.c:801 ../src/keybindings.c:436 +#: ../src/interface.c:806 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Ir para o Marcador _Anterior" -#: ../src/interface.c:810 +#: ../src/interface.c:815 msgid "_Go to Line" msgstr "_Ir para Linha" -#: ../src/interface.c:818 ../src/interface.c:2258 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3528 msgid "_More" -msgstr "" +msgstr "_Mais" -#: ../src/interface.c:825 ../src/keybindings.c:398 -#, fuzzy +#: ../src/interface.c:830 ../src/keybindings.c:399 msgid "Find Next _Selection" -msgstr "Localizar Próxima Seleção" +msgstr "Localizar Próxima _Seleção" -#: ../src/interface.c:829 ../src/keybindings.c:400 -#, fuzzy +#: ../src/interface.c:834 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Localizar Seleção Anterior" -#: ../src/interface.c:838 ../src/interface.c:2340 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" msgstr "Localizar _Uso" -#: ../src/interface.c:842 ../src/interface.c:2348 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "Localizar Uso do _Documento" -#: ../src/interface.c:851 ../src/keybindings.c:415 -#, fuzzy +#: ../src/interface.c:856 ../src/keybindings.c:416 msgid "_Mark All" msgstr "Marcar Tudo" -#: ../src/interface.c:860 ../src/interface.c:2356 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Ir para a Definição do Ró_tulo" -#: ../src/interface.c:864 +#: ../src/interface.c:869 msgid "Go to T_ag Declaration" msgstr "Ir p_ara a Declaração do Rótulo" -#: ../src/interface.c:875 +#: ../src/interface.c:880 msgid "Change _Font" msgstr "Alterar _Fonte" -#: ../src/interface.c:888 +#: ../src/interface.c:893 msgid "To_ggle All Additional Widgets" msgstr "Exibir/ocultar Todos os _Painéis Adicionais" -#: ../src/interface.c:892 +#: ../src/interface.c:897 msgid "Full_screen" msgstr "_Tela Cheia" -#: ../src/interface.c:896 +#: ../src/interface.c:901 msgid "Show Message _Window" msgstr "Exibir _Janela de Mensagens" -#: ../src/interface.c:901 +#: ../src/interface.c:906 msgid "Show _Toolbar" msgstr "Exibir _Barra de Ferramentas" -#: ../src/interface.c:906 +#: ../src/interface.c:911 msgid "Show Side_bar" msgstr "Exibir Barra _Lateral" -#: ../src/interface.c:911 ../src/interface.c:4247 ../src/interface.c:5576 +#: ../src/interface.c:916 ../src/interface.c:4283 ../src/interface.c:5616 #: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:918 +#: ../src/interface.c:923 msgid "Show _Markers Margin" msgstr "Exibir Margem de _Marcadores" -#: ../src/interface.c:923 +#: ../src/interface.c:928 msgid "Show _Line Numbers" msgstr "Exibir _Números de Linhas" -#: ../src/interface.c:928 +#: ../src/interface.c:933 msgid "Show _White Space" msgstr "Exibir Espaços em _Branco" -#: ../src/interface.c:932 +#: ../src/interface.c:937 msgid "Show Line _Endings" msgstr "_Exibir Fim de Linha" -#: ../src/interface.c:936 +#: ../src/interface.c:941 msgid "Show _Indentation Guides" -msgstr "Ex_ibir Guias de Endentação" +msgstr "Ex_ibir Guias de Recuo" -#: ../src/interface.c:957 +#: ../src/interface.c:962 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:964 +#: ../src/interface.c:969 msgid "_Line Wrapping" msgstr "_Quebrar Linhas" -#: ../src/interface.c:969 +#: ../src/interface.c:974 msgid "Line _Breaking" msgstr "Que_bra de Linha" -#: ../src/interface.c:973 +#: ../src/interface.c:978 msgid "_Auto-indentation" -msgstr "_Auto-endentação" +msgstr "Recuo _Automático" -#: ../src/interface.c:978 +#: ../src/interface.c:983 msgid "In_dent Type" -msgstr "T_ipo de endentação" +msgstr "T_ipo de recuo" -#: ../src/interface.c:985 ../src/interface.c:3855 ../src/interface.c:5474 +#: ../src/interface.c:990 ../src/interface.c:3891 ../src/interface.c:5514 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:991 ../src/interface.c:3846 ../src/interface.c:5465 +#: ../src/interface.c:996 ../src/interface.c:3882 ../src/interface.c:5505 msgid "_Spaces" msgstr "E_spaços" -#: ../src/interface.c:997 ../src/interface.c:3864 ../src/interface.c:5483 +#: ../src/interface.c:1002 ../src/interface.c:3900 ../src/interface.c:5523 msgid "T_abs and Spaces" msgstr "T_abs e Espaços" -#: ../src/interface.c:1003 +#: ../src/interface.c:1008 msgid "Indent Widt_h" -msgstr "" +msgstr "_Quantidade de Recuo" -#: ../src/interface.c:1010 +#: ../src/interface.c:1015 msgid "_1" -msgstr "" +msgstr "_1" -#: ../src/interface.c:1016 +#: ../src/interface.c:1021 msgid "_2" -msgstr "" +msgstr "_2" -#: ../src/interface.c:1022 +#: ../src/interface.c:1027 msgid "_3" -msgstr "" +msgstr "_3" -#: ../src/interface.c:1028 +#: ../src/interface.c:1033 msgid "_4" -msgstr "" +msgstr "_4" -#: ../src/interface.c:1034 +#: ../src/interface.c:1039 msgid "_5" -msgstr "" +msgstr "_5" -#: ../src/interface.c:1040 +#: ../src/interface.c:1045 msgid "_6" -msgstr "" +msgstr "_6" -#: ../src/interface.c:1046 +#: ../src/interface.c:1051 msgid "_7" -msgstr "" +msgstr "_7" -#: ../src/interface.c:1052 +#: ../src/interface.c:1057 msgid "_8" -msgstr "" +msgstr "_8" -#: ../src/interface.c:1063 +#: ../src/interface.c:1068 msgid "Read _Only" msgstr "Somente _Leitura" -#: ../src/interface.c:1067 +#: ../src/interface.c:1072 msgid "_Write Unicode BOM" msgstr "Gravar _Unicode BOM" -#: ../src/interface.c:1076 +#: ../src/interface.c:1081 msgid "Set File_type" msgstr "Definir _Tipo de Arquivo" -#: ../src/interface.c:1086 +#: ../src/interface.c:1091 msgid "Set _Encoding" msgstr "Definir _Codificação" -#: ../src/interface.c:1096 +#: ../src/interface.c:1101 msgid "Set Line E_ndings" msgstr "Definir _Fim de Linha" -#: ../src/interface.c:1103 +#: ../src/interface.c:1108 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converter e Definir para _CR/LF (Win)" -#: ../src/interface.c:1109 +#: ../src/interface.c:1114 msgid "Convert and Set to _LF (Unix)" msgstr "Converter e Definir para _LF (Unix)" -#: ../src/interface.c:1115 +#: ../src/interface.c:1120 msgid "Convert and Set to CR (_Mac)" msgstr "Converter e Definir para CR (_Mac)" -#: ../src/interface.c:1126 +#: ../src/interface.c:1131 msgid "_Strip Trailing Spaces" msgstr "_Remover espaços no final" -#: ../src/interface.c:1130 +#: ../src/interface.c:1135 msgid "_Replace Tabs by Spaces" msgstr "_Substituir Tabs por Espaços" -#: ../src/interface.c:1134 +#: ../src/interface.c:1139 msgid "Replace Spaces b_y Tabs" msgstr "Substituir Es_paços por Tabs" -#: ../src/interface.c:1143 +#: ../src/interface.c:1148 msgid "_Fold All" msgstr "_Dobrar Todos" -#: ../src/interface.c:1147 +#: ../src/interface.c:1152 msgid "_Unfold All" msgstr "D_esdobrar Todos" -#: ../src/interface.c:1156 +#: ../src/interface.c:1161 msgid "Remove _Markers" msgstr "Remover _Marcadores" -#: ../src/interface.c:1160 +#: ../src/interface.c:1165 msgid "Remove Error _Indicators" msgstr "Remover I_ndicadores de Erro" -#: ../src/interface.c:1164 +#: ../src/interface.c:1169 msgid "_Project" msgstr "_Projeto" -#: ../src/interface.c:1171 +#: ../src/interface.c:1176 msgid "_New" msgstr "_Novo" -#: ../src/interface.c:1179 +#: ../src/interface.c:1184 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:1187 +#: ../src/interface.c:1192 msgid "_Recent Projects" msgstr "Projetos _Recentes" -#: ../src/interface.c:1191 +#: ../src/interface.c:1196 msgid "_Close" msgstr "_Fechar" -#: ../src/interface.c:1213 -#, fuzzy +#: ../src/interface.c:1218 msgid "_Apply Default Indentation" -msgstr "_Auto-endentação" +msgstr "_Aplicar recuo padrão" -#: ../src/interface.c:1216 +#: ../src/interface.c:1221 msgid "Apply the default indentation settings to all documents" -msgstr "" +msgstr "Aplicar configuração de recuo padrão a todos os documentos" -#: ../src/interface.c:1222 +#: ../src/interface.c:1227 msgid "_Tools" msgstr "_Ferramentas" -#: ../src/interface.c:1229 +#: ../src/interface.c:1234 msgid "_Reload Configuration" msgstr "_Recarregar configuração" -#: ../src/interface.c:1237 +#: ../src/interface.c:1242 msgid "C_onfiguration Files" -msgstr "Arquivos de C_onfiguração" +msgstr "Arquivos de c_onfiguração" -#: ../src/interface.c:1250 +#: ../src/interface.c:1255 msgid "_Color Chooser" msgstr "_Seletor de Cores" -#: ../src/interface.c:1258 +#: ../src/interface.c:1263 msgid "_Word Count" msgstr "_Contar Palavras" -#: ../src/interface.c:1262 +#: ../src/interface.c:1267 msgid "Load Ta_gs" msgstr "Carregar Ró_tulos" -#: ../src/interface.c:1266 ../src/interface.c:1273 +#: ../src/interface.c:1271 ../src/interface.c:1278 msgid "_Help" msgstr "_Ajuda" -#: ../src/interface.c:1281 +#: ../src/interface.c:1286 msgid "_Website" msgstr "Sítio na _Web" -#: ../src/interface.c:1285 +#: ../src/interface.c:1290 msgid "_Keyboard Shortcuts" msgstr "Atalhos de _Teclado" -#: ../src/interface.c:1289 +#: ../src/interface.c:1294 msgid "_Debug Messages" msgstr "_Depurar Mensagens" -#: ../src/interface.c:1328 ../src/sidebar.c:132 +#: ../src/interface.c:1333 ../src/sidebar.c:132 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1342 +#: ../src/interface.c:1347 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1378 +#: ../src/interface.c:1383 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1392 +#: ../src/interface.c:1397 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1407 +#: ../src/interface.c:1412 msgid "Messages" msgstr "Mensagens" -#: ../src/interface.c:1420 +#: ../src/interface.c:1425 msgid "Scribble" msgstr "Rascunho" -#: ../src/interface.c:2094 +#: ../src/interface.c:2103 msgid "_Toolbar Preferences" msgstr "Preferências da Barra de Ferramen_tas" -#: ../src/interface.c:2107 +#: ../src/interface.c:2116 msgid "_Hide Toolbar" msgstr "_Ocultar Barra de Ferramentas" -#: ../src/interface.c:2239 -#, fuzzy +#: ../src/interface.c:2249 msgid "I_nsert" msgstr "Inserir" -#: ../src/interface.c:2319 ../src/keybindings.c:374 -msgid "_Insert Alternative White Space" -msgstr "_Inserir Espaço em Branco Alternativo" - -#: ../src/interface.c:2364 +#: ../src/interface.c:2378 msgid "Conte_xt Action" msgstr "Ação Conte_xtual" -#: ../src/interface.c:2885 ../src/keybindings.c:383 +#: ../src/interface.c:2904 ../src/keybindings.c:384 msgid "Preferences" msgstr "Preferências" -#: ../src/interface.c:2921 +#: ../src/interface.c:2940 msgid "Load files from the last session" msgstr "Abrir arquivos da última sessão" -#: ../src/interface.c:2924 +#: ../src/interface.c:2943 msgid "Opens at startup the files from the last session" msgstr "Abre os arquivos da última sessão ao iniciar" -#: ../src/interface.c:2926 +#: ../src/interface.c:2945 msgid "Load virtual terminal support" msgstr "Carregar suporte ao terminal virtual" -#: ../src/interface.c:2928 +#: ../src/interface.c:2947 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1656,39 +1644,39 @@ "A emulação de terminal virtual (VTE) deve ser carregada ao iniciar? " "Desabilite-a se você não precisar dela" -#: ../src/interface.c:2930 +#: ../src/interface.c:2949 msgid "Enable plugin support" msgstr "Habilitar suporte a plugin" -#: ../src/interface.c:2934 +#: ../src/interface.c:2953 msgid "<b>Startup</b>" msgstr "<b>Iniciar</b>" -#: ../src/interface.c:2953 +#: ../src/interface.c:2972 msgid "Save window position and geometry" msgstr "Salvar a posição e geometria da janela" -#: ../src/interface.c:2956 +#: ../src/interface.c:2975 msgid "Saves the window position and geometry and restores it at the start" msgstr "Salva a posição e geometria da janela e a restaura ao iniciar" -#: ../src/interface.c:2958 +#: ../src/interface.c:2977 msgid "Confirm exit" msgstr "Confirmar saída" -#: ../src/interface.c:2961 +#: ../src/interface.c:2980 msgid "Shows a confirmation dialog on exit" msgstr "Exibe um diálogo de confirmação ao sair" -#: ../src/interface.c:2963 +#: ../src/interface.c:2982 msgid "<b>Shutdown</b>" msgstr "<b>Desligar</b>" -#: ../src/interface.c:2984 +#: ../src/interface.c:3003 msgid "Startup path:" msgstr "Caminho inicial:" -#: ../src/interface.c:2996 +#: ../src/interface.c:3015 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1696,19 +1684,19 @@ "Caminho inicial para abrir ou salvar arquivos. Deve ser um caminho absoluto. " "Deixe em branco para usar o diretório de trabalho atual." -#: ../src/interface.c:3009 +#: ../src/interface.c:3028 msgid "Project files:" msgstr "Arquivos de Projeto:" -#: ../src/interface.c:3021 +#: ../src/interface.c:3040 msgid "Path to start in when opening project files" msgstr "Caminho para iniciar quando estiver abrindo arquivos de projeto" -#: ../src/interface.c:3034 +#: ../src/interface.c:3053 msgid "Extra plugin path:" msgstr "Caminho extra de plugins:" -#: ../src/interface.c:3046 +#: ../src/interface.c:3065 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1718,19 +1706,19 @@ "configuração. O caminho inserido aqui será pesquisado adicionalmente por " "plugins. Deixe em branco para desabilitar." -#: ../src/interface.c:3059 +#: ../src/interface.c:3078 msgid "<b>Paths</b>" msgstr "<b>Caminhos</b>" -#: ../src/interface.c:3064 +#: ../src/interface.c:3083 msgid "Startup" msgstr "Iniciar" -#: ../src/interface.c:3087 +#: ../src/interface.c:3106 msgid "Beep on errors or when compilation has finished" msgstr "Alerta sonoro para erros ou para o término da compilação" -#: ../src/interface.c:3090 +#: ../src/interface.c:3109 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1738,11 +1726,11 @@ "Ativar ou não um alerta sonoro para ocorrência de erros ou término do " "processo de compilação" -#: ../src/interface.c:3092 +#: ../src/interface.c:3111 msgid "Switch to status message list at new message" msgstr "Ir para lista de mensagens de estado quando houver nova mensagem" -#: ../src/interface.c:3095 +#: ../src/interface.c:3114 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1750,11 +1738,11 @@ "Ir para a aba de mensagens de estado (na janela do bloco de notas ao pé da " "tela) se uma nova mensagem chegar" -#: ../src/interface.c:3097 +#: ../src/interface.c:3116 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensagens de estado na barra de estado" -#: ../src/interface.c:3100 +#: ../src/interface.c:3119 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1762,11 +1750,11 @@ "Remove todas as mensagens da barra de estado. As mensagens ainda são " "mostradas na janela de mensagens de estado." -#: ../src/interface.c:3102 +#: ../src/interface.c:3121 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Foco automático de painéis (o foco segue o mouse)" -#: ../src/interface.c:3105 +#: ../src/interface.c:3124 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1776,11 +1764,11 @@ "Funciona para o painel do editor principal, o rascunho, os campos pesquisar " "e ir para linha da barra de ferramentas e o VTE." -#: ../src/interface.c:3107 +#: ../src/interface.c:3126 msgid "Use Windows File Open/Save dialogs" msgstr "Usar diálogos do Windows para Abrir/Salvar Arquivo" -#: ../src/interface.c:3110 +#: ../src/interface.c:3129 msgid "" "Defines whether to use the native Windows File Open/Save dialogs or whether " "to use the GTK default dialogs" @@ -1788,15 +1776,15 @@ "Define o uso ou não dos diálogos nativos do Windows para Abrir/Salvar " "Arquivos em vez de usar os diálogos padrão do GTK" -#: ../src/interface.c:3112 ../src/interface.c:3491 ../src/interface.c:4457 +#: ../src/interface.c:3131 ../src/interface.c:3367 ../src/interface.c:4493 msgid "<b>Miscellaneous</b>" msgstr "<b>Miscelânea</b>" -#: ../src/interface.c:3131 +#: ../src/interface.c:3150 msgid "Always wrap search and hide the Find dialog" msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" -#: ../src/interface.c:3134 +#: ../src/interface.c:3153 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1804,11 +1792,11 @@ "Sempre circula a pesquisa pelo documento e oculta o diálogo Localizar após " "clicar Próximo/Anterior" -#: ../src/interface.c:3136 +#: ../src/interface.c:3155 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usar a palavra sob o cursor para os diálogos Localizar" -#: ../src/interface.c:3139 +#: ../src/interface.c:3158 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1816,19 +1804,19 @@ "Usa a palavra atualmente sob o cursor quando for aberto um diálogo " "Localizar, Localizar em Arquivos ou Substituir, e não houver nenhuma seleção" -#: ../src/interface.c:3141 +#: ../src/interface.c:3160 msgid "Use the current file's directory for Find in Files" msgstr "Usar o diretório do arquivo atual para Localizar em Arquivos" -#: ../src/interface.c:3145 +#: ../src/interface.c:3164 msgid "<b>Search</b>" msgstr "<b>Pesquisar</b>" -#: ../src/interface.c:3164 +#: ../src/interface.c:3183 msgid "Use project-based session files" msgstr "Usar arquivos de sessão baseados em projeto" -#: ../src/interface.c:3167 +#: ../src/interface.c:3186 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1836,11 +1824,11 @@ "Salvar ou não os arquivos de sessão de um projeto e abri-los quando o " "projeto for reaberto" -#: ../src/interface.c:3169 +#: ../src/interface.c:3188 msgid "Store project file inside the project base directory" msgstr "Armazenar arquivo de projeto dentro do diretório base do projeto" -#: ../src/interface.c:3172 +#: ../src/interface.c:3191 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1852,11 +1840,11 @@ "diretório base. Você pode ainda alterar o caminho do arquivo de projeto no " "diálogo Novo Projeto." -#: ../src/interface.c:3174 +#: ../src/interface.c:3193 msgid "<b>Projects</b>" msgstr "<b>Projetos</b>" -#: ../src/interface.c:3179 +#: ../src/interface.c:3198 msgid "Miscellaneous" msgstr "Miscelânea" @@ -1864,85 +1852,97 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3183 ../src/prefs.c:1551 +#: ../src/interface.c:3202 ../src/prefs.c:1551 msgid "General" msgstr "Geral" -#: ../src/interface.c:3220 +#: ../src/interface.c:3243 msgid "Show symbol list" msgstr "Exibir lista de símbolos" -#: ../src/interface.c:3223 +#: ../src/interface.c:3246 msgid "Toggle the symbol list on and off" msgstr "Exibe ou esconde a lista de símbolos" -#: ../src/interface.c:3225 +#: ../src/interface.c:3248 msgid "Show documents list" msgstr "Exibir lista de documentos" -#: ../src/interface.c:3228 +#: ../src/interface.c:3251 msgid "Toggle the documents list on and off" msgstr "Exibe ou esconde a lista de documentos" -#: ../src/interface.c:3230 +#: ../src/interface.c:3253 msgid "Show sidebar" msgstr "Exibir Barra Lateral" -#: ../src/interface.c:3238 +#: ../src/interface.c:3261 msgid "Position:" msgstr "Posição:" -#: ../src/interface.c:3242 ../src/interface.c:3365 ../src/interface.c:3426 -#: ../src/interface.c:3444 ../src/interface.c:3462 +#: ../src/interface.c:3265 ../src/interface.c:3421 ../src/interface.c:3482 +#: ../src/interface.c:3500 ../src/interface.c:3518 msgid "Left" msgstr "Esquerda" -#: ../src/interface.c:3249 ../src/interface.c:3373 ../src/interface.c:3427 -#: ../src/interface.c:3445 ../src/interface.c:3463 +#: ../src/interface.c:3272 ../src/interface.c:3429 ../src/interface.c:3483 +#: ../src/interface.c:3501 ../src/interface.c:3519 msgid "Right" msgstr "Direita" -#: ../src/interface.c:3255 +#: ../src/interface.c:3278 msgid "<b>Sidebar</b>" msgstr "<b>Barra Lateral</b>" -#: ../src/interface.c:3276 +#: ../src/interface.c:3299 msgid "Symbol list:" msgstr "Lista de Símbolos:" -#: ../src/interface.c:3283 ../src/interface.c:3413 +#: ../src/interface.c:3306 ../src/interface.c:3469 msgid "Message window:" msgstr "Janela de Mensagens:" -#: ../src/interface.c:3290 ../src/interface.c:3449 +#: ../src/interface.c:3313 ../src/interface.c:3505 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3302 +#: ../src/interface.c:3325 msgid "Sets the font for the message window" msgstr "Define a fonte para a janela de mensagens" -#: ../src/interface.c:3310 +#: ../src/interface.c:3333 msgid "Sets the font for the symbol list" msgstr "Define a fonte para a lista de símbolos" -#: ../src/interface.c:3318 +#: ../src/interface.c:3341 msgid "Sets the editor font" msgstr "Define a fonte do editor" -#: ../src/interface.c:3320 +#: ../src/interface.c:3343 msgid "<b>Fonts</b>" msgstr "<b>Fontes</b>" -#: ../src/interface.c:3339 +#: ../src/interface.c:3362 +msgid "Show status bar" +msgstr "Exibir barra de estado" + +#: ../src/interface.c:3365 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "Exibe ou oculta a barra de estado na base da janela principal" + +#: ../src/interface.c:3372 ../src/interface.c:3532 ../src/prefs.c:1553 +msgid "Interface" +msgstr "Interface" + +#: ../src/interface.c:3395 msgid "Show editor tabs" msgstr "Exibir abas do editor" -#: ../src/interface.c:3343 +#: ../src/interface.c:3399 msgid "Show close buttons" msgstr "Exibir botões de fechar" -#: ../src/interface.c:3346 +#: ../src/interface.c:3402 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1950,23 +1950,23 @@ "Mostra um pequeno botão de cruz na aba de arquivos para fechar arquivos " "facilmente quando for clicado (exige que o Geany seja reiniciado)" -#: ../src/interface.c:3352 +#: ../src/interface.c:3408 msgid "Placement of new file tabs:" msgstr "Localização das abas de novo arquivo:" -#: ../src/interface.c:3368 +#: ../src/interface.c:3424 msgid "File tabs will be placed on the left of the notebook" msgstr "Abas de arquivos serão colocadas à esquerda do bloco de notas" -#: ../src/interface.c:3376 +#: ../src/interface.c:3432 msgid "File tabs will be placed on the right of the notebook" msgstr "Abas de arquivos serão colocadas à direita do bloco de notas" -#: ../src/interface.c:3380 +#: ../src/interface.c:3436 msgid "Next to current" msgstr "Próximo ao anterior " -#: ../src/interface.c:3385 +#: ../src/interface.c:3441 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" @@ -1974,117 +1974,105 @@ "Colocar ou não as tabulações de arquivo próximas da tabulação atual em vez " "de nas bordas da agenda" -#: ../src/interface.c:3387 +#: ../src/interface.c:3443 msgid "Double-clicking hides all additional widgets" msgstr "Duplo clique oculta todos os painéis adicionais" -#: ../src/interface.c:3390 +#: ../src/interface.c:3446 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama o comando Exibir->Alternar Todos os Painéis Adicionais" -#: ../src/interface.c:3392 +#: ../src/interface.c:3448 msgid "<b>Editor tabs</b>" msgstr "<b>Abas do editor</b>" -#: ../src/interface.c:3428 ../src/interface.c:3446 ../src/interface.c:3464 +#: ../src/interface.c:3484 ../src/interface.c:3502 ../src/interface.c:3520 msgid "Top" msgstr "Cima" -#: ../src/interface.c:3429 ../src/interface.c:3447 ../src/interface.c:3465 +#: ../src/interface.c:3485 ../src/interface.c:3503 ../src/interface.c:3521 msgid "Bottom" msgstr "Baixo" -#: ../src/interface.c:3431 +#: ../src/interface.c:3487 msgid "Sidebar:" msgstr "Barra Lateral:" -#: ../src/interface.c:3467 +#: ../src/interface.c:3523 msgid "<b>Tab positions</b>" msgstr "<b>Posições das abas</b>" -#: ../src/interface.c:3486 -msgid "Show status bar" -msgstr "Exibir barra de estado" - -#: ../src/interface.c:3489 -msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Exibe ou oculta a barra de estado na base da janela principal" - -#: ../src/interface.c:3496 ../src/prefs.c:1553 -msgid "Interface" -msgstr "Interface" - -#: ../src/interface.c:3527 +#: ../src/interface.c:3563 msgid "Show T_oolbar" msgstr "Exibir Barra de Ferramen_tas" -#: ../src/interface.c:3531 +#: ../src/interface.c:3567 msgid "_Append Toolbar to the Menu" msgstr "_Anexar Barra de Ferramentas ao Menu" -#: ../src/interface.c:3534 +#: ../src/interface.c:3570 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Empacota a barra de ferramentas no menu principal, para economizar espaço " "vertical" -#: ../src/interface.c:3556 ../src/toolbar.c:930 +#: ../src/interface.c:3592 ../src/toolbar.c:931 msgid "Customize Toolbar" msgstr "Personalizar Barra de Ferramentas" -#: ../src/interface.c:3576 +#: ../src/interface.c:3612 msgid "System _Default" msgstr "_Default do Sistema" -#: ../src/interface.c:3584 +#: ../src/interface.c:3620 msgid "Images _and Text" msgstr "Im_agens e Texto" -#: ../src/interface.c:3592 +#: ../src/interface.c:3628 msgid "_Images Only" msgstr "Somente _Imagens" -#: ../src/interface.c:3600 +#: ../src/interface.c:3636 msgid "_Text Only" msgstr "Somente _Texto" -#: ../src/interface.c:3608 +#: ../src/interface.c:3644 msgid "<b>Icon Style</b>" msgstr "<b>Estilo do Ícone</b>" -#: ../src/interface.c:3629 +#: ../src/interface.c:3665 msgid "S_ystem Default" msgstr "Default do S_istema" -#: ../src/interface.c:3637 +#: ../src/interface.c:3673 msgid "_Small Icons" msgstr "Ícone_s Pequenos" -#: ../src/interface.c:3645 +#: ../src/interface.c:3681 msgid "_Very Small Icons" msgstr "Ícones _Muito Pequenos" -#: ../src/interface.c:3653 +#: ../src/interface.c:3689 msgid "_Large Icons" msgstr "Ícones _Grandes" -#: ../src/interface.c:3661 +#: ../src/interface.c:3697 msgid "<b>Icon Size</b>" msgstr "<b>Tamanho do Ícone</b>" -#: ../src/interface.c:3666 +#: ../src/interface.c:3702 msgid "<b>Toolbar</b>" msgstr "<b>Barra de ferramentas</b>" -#: ../src/interface.c:3671 ../src/prefs.c:1555 +#: ../src/interface.c:3707 ../src/prefs.c:1555 msgid "Toolbar" msgstr "Barra de Ferramentas" -#: ../src/interface.c:3698 +#: ../src/interface.c:3734 msgid "Line wrapping" msgstr "Quebrar linhas" -#: ../src/interface.c:3701 +#: ../src/interface.c:3737 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -2094,12 +2082,11 @@ "quebra de linha possui um custo elevado de desempenho para documentos " "grandes, e deveria ser desabilitada em máquinas lentas." -#: ../src/interface.c:3703 -#, fuzzy +#: ../src/interface.c:3739 msgid "\"Smart\" home key" msgstr "Habilitar tecla home \"inteligente\"" -#: ../src/interface.c:3706 +#: ../src/interface.c:3742 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -2113,11 +2100,11 @@ "desabilitado, a tecla HOME sempre move o cursor para o início da linha " "atual, independente da sua posição." -#: ../src/interface.c:3708 +#: ../src/interface.c:3744 msgid "Disable Drag and Drop" msgstr "Desabilitar Arrastar e Soltar" -#: ../src/interface.c:3711 +#: ../src/interface.c:3747 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -2126,16 +2113,15 @@ "impossível arrastar e soltar qualquer seleção dentro ou fora da janela do " "editor" -#: ../src/interface.c:3713 -#, fuzzy +#: ../src/interface.c:3749 msgid "Code folding" -msgstr "Habilitar dobra" +msgstr "Habilitar agrupamento de código" -#: ../src/interface.c:3717 +#: ../src/interface.c:3753 msgid "Fold/unfold all children of a fold point" msgstr "Dobrar/Desdobrar todos os filhos de um ponto de dobra" -#: ../src/interface.c:3720 +#: ../src/interface.c:3756 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2144,11 +2130,11 @@ "tecla Shift quando clicar em um símbolo de dobra, o comportamento inverso " "será utilizado." -#: ../src/interface.c:3722 +#: ../src/interface.c:3758 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar erros de compilação" -#: ../src/interface.c:3725 +#: ../src/interface.c:3761 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -2156,23 +2142,23 @@ "Usar ou não indicadores (um sublinhado irregular) para destacar as linhas " "onde o compilador encontrou um aviso ou um erro" -#: ../src/interface.c:3727 +#: ../src/interface.c:3763 msgid "Newline strips trailing spaces" msgstr "Nova linha remove espaços no final" -#: ../src/interface.c:3730 +#: ../src/interface.c:3766 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Habilita a nova linha a remover os espaços no final da linha anterior" -#: ../src/interface.c:3736 +#: ../src/interface.c:3772 msgid "Line breaking column:" msgstr "Coluna de quebra de linha:" -#: ../src/interface.c:3750 +#: ../src/interface.c:3786 msgid "Comment toggle marker:" msgstr "Comentar marcador de alternar:" -#: ../src/interface.c:3757 +#: ../src/interface.c:3793 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -2180,116 +2166,117 @@ "Uma string que é adicionada ao alternar um comentário de linha em um arquivo " "fonte. É usada para marcar o comentário como alternado" -#: ../src/interface.c:3759 +#: ../src/interface.c:3795 msgid "<b>Features</b>" msgstr "<b>Características</b>" -#: ../src/interface.c:3764 +#: ../src/interface.c:3800 msgid "Features" msgstr "Características" -#: ../src/interface.c:3777 +#: ../src/interface.c:3813 msgid "" "Note: To apply these settings to all currently open documents, use " "<i>Project->Apply Default Indentation</i>." msgstr "" +"Observação: Para aplicar essa configuração a todos os documentos abertos no " +"momento, use <i>Projeto->Aplicar Recuo Padrão</i>." -#: ../src/interface.c:3804 ../src/interface.c:5423 +#: ../src/interface.c:3840 ../src/interface.c:5463 msgid "Auto-indent mode:" -msgstr "Modo de auto endentação:" +msgstr "Modo de recuo automático:" -#: ../src/interface.c:3817 ../src/interface.c:5436 +#: ../src/interface.c:3853 ../src/interface.c:5476 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3818 ../src/interface.c:5437 +#: ../src/interface.c:3854 ../src/interface.c:5477 msgid "Current chars" msgstr "Caracteres atuais" -#: ../src/interface.c:3819 ../src/interface.c:5438 +#: ../src/interface.c:3855 ../src/interface.c:5478 msgid "Match braces" msgstr "Casar delimitadores" -#: ../src/interface.c:3821 ../src/interface.c:4147 ../src/interface.c:5440 +#: ../src/interface.c:3857 ../src/interface.c:4183 ../src/interface.c:5480 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3828 ../src/interface.c:5447 +#: ../src/interface.c:3864 ../src/interface.c:5487 msgid "Width:" msgstr "Largura:" -#: ../src/interface.c:3841 ../src/interface.c:5460 +#: ../src/interface.c:3877 ../src/interface.c:5500 msgid "The width in chars of a single indent" -msgstr "A largura em caracteres de uma única endentação" +msgstr "Largura em caracteres de um único recuo" -#: ../src/interface.c:3851 ../src/interface.c:5470 +#: ../src/interface.c:3887 ../src/interface.c:5510 msgid "Use spaces when inserting indentation" -msgstr "Usar espaços quando inserir endentação" +msgstr "Usar espaços quando inserir recuo" -#: ../src/interface.c:3860 ../src/interface.c:5479 +#: ../src/interface.c:3896 ../src/interface.c:5519 msgid "Use one tab per indent" -msgstr "Usa um tab por endentação" +msgstr "Usa um tab por recuo" -#: ../src/interface.c:3869 ../src/interface.c:5488 +#: ../src/interface.c:3905 ../src/interface.c:5528 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -"Usa espaços se a endentação total for menor do que a largura da tabulação, " -"senão usa ambos" +"Usar espaços se o recuo total for menor do que a largura da tabulação, senão " +"usa ambos" -#: ../src/interface.c:3878 ../src/interface.c:5497 +#: ../src/interface.c:3914 ../src/interface.c:5537 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -"Detectar ou não o tipo de endentação a partir do conteúdo de um arquivo " -"quando ele for aberto" +"Detectar ou não o tipo de recuo a partir do conteúdo de um arquivo quando " +"ele for aberto" -#: ../src/interface.c:3880 +#: ../src/interface.c:3916 msgid "Tab key indents" -msgstr "Endentações da tecla Tab" +msgstr "Recuos da tecla Tab" -#: ../src/interface.c:3883 +#: ../src/interface.c:3919 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -"Pressionar tab/shift-tab endenta/desendenta em vez de inserir um caracter de " -"tabulação" +"Pressionar tab/shift-tab insere/remove recuo em vez de inserir um caracter " +"de tabulação" -#: ../src/interface.c:3885 +#: ../src/interface.c:3921 msgid "<b>Indentation</b>" -msgstr "<b>Endentação</b>" +msgstr "<b>Recuo</b>" -#: ../src/interface.c:3890 ../src/interface.c:5499 +#: ../src/interface.c:3926 ../src/interface.c:5539 msgid "Indentation" -msgstr "Endentação" +msgstr "Recuo" -#: ../src/interface.c:3913 +#: ../src/interface.c:3949 msgid "Snippet completion" -msgstr "Completação de fragmento" +msgstr "Completar fragmento" -#: ../src/interface.c:3916 +#: ../src/interface.c:3952 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -"Digite uma dada seqüência curta de caracteres e ela será completada para uma " -"seqüência mais complexa pressionando-se uma única tecla" +"Digite uma dada sequência curta de caracteres e ela será completada para uma " +"sequência mais complexa pressionando-se uma única tecla" -#: ../src/interface.c:3918 -#, fuzzy +#: ../src/interface.c:3954 msgid "XML/HTML tag auto-closing" -msgstr "Auto-completação de tags XML" +msgstr "Fechamento automático de tags XML/HTML" -#: ../src/interface.c:3921 +#: ../src/interface.c:3957 msgid "Insert matching closing tag for XML/HTML" -msgstr "" +msgstr "Inserir tag de fechamento correspondente para XML/HTML" -#: ../src/interface.c:3923 +#: ../src/interface.c:3959 msgid "Automatic continuation of multi-line comments" msgstr "Continuação automática de comentários multi-linha" -#: ../src/interface.c:3926 +#: ../src/interface.c:3962 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2297,11 +2284,11 @@ "Continua automaticamente comentários multi-linha em linguagens como C, C++ e " "Java quando uma nova linha for inserida dentro de um comentário deste tipo" -#: ../src/interface.c:3928 +#: ../src/interface.c:3964 msgid "Autocomplete symbols" msgstr "Auto-completar símbolos" -#: ../src/interface.c:3931 +#: ../src/interface.c:3967 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2309,142 +2296,140 @@ "Auto-completar símbolos conhecidos em arquivos abertos (nomes de função, " "variáveis globais, ...)" -#: ../src/interface.c:3933 +#: ../src/interface.c:3969 msgid "Autocomplete all words in document" msgstr "Completa automaticamente todas as palavras no documeto" -#: ../src/interface.c:3937 +#: ../src/interface.c:3973 msgid "Drop rest of word on completion" msgstr "Perder resto da palavra ao completar" -#: ../src/interface.c:3947 +#: ../src/interface.c:3983 msgid "Max. symbol name suggestions:" msgstr "Máx. sugestões de nomes de símbolos:" -#: ../src/interface.c:3954 +#: ../src/interface.c:3990 msgid "Completion list height:" -msgstr "Altura da lista de completação:" +msgstr "Altura da lista de completamento:" -#: ../src/interface.c:3961 +#: ../src/interface.c:3997 msgid "Characters to type for autocompletion:" -msgstr "Caracteres a digitar para completação:" +msgstr "Caracteres a digitar para auto-completar:" -#: ../src/interface.c:3974 +#: ../src/interface.c:4010 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" -"A quantidade de caracteres necessários para exibir a lista de auto-" -"completação de símbolos" +"A quantidade de caracteres necessários para exibir a lista deauto-" +"completamento de símbolos" -#: ../src/interface.c:3983 +#: ../src/interface.c:4019 msgid "Display height in rows for the autocompletion list" -msgstr "Exibir altura em linhas para a lista de auto-completação" +msgstr "Exibir altura em linhas para a lista de auto-completamento" -#: ../src/interface.c:3992 +#: ../src/interface.c:4028 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Número máximo de entradas para exibir na lista de auto-completação" +msgstr "Número máximo de entradas para exibir na lista de auto-completamento" -#: ../src/interface.c:3995 +#: ../src/interface.c:4031 msgid "<b>Completions</b>" -msgstr "<b>Completações</b>" +msgstr "<b>Completamento</b>" -#: ../src/interface.c:4014 +#: ../src/interface.c:4050 msgid "Parenthesis ( )" msgstr "Parênteses ( )" -#: ../src/interface.c:4019 +#: ../src/interface.c:4055 msgid "Auto-close parenthesis when typing an opening one" msgstr "Fechar parênteses automaticamente quando um for aberto" -#: ../src/interface.c:4021 +#: ../src/interface.c:4057 msgid "Single quotes ' '" msgstr "Aspas simples ' '" -#: ../src/interface.c:4026 -#, fuzzy +#: ../src/interface.c:4062 msgid "Auto-close single quote when typing an opening one" -msgstr "Fechar aspas simples automaticamente quando um for aberto" +msgstr "Fechar aspas simples automaticamente quando uma for aberta" -#: ../src/interface.c:4028 +#: ../src/interface.c:4064 msgid "Curly brackets { }" msgstr "Chaves { }" -#: ../src/interface.c:4033 +#: ../src/interface.c:4069 msgid "Auto-close curly bracket when typing an opening one" msgstr "Fechar chaves automaticamente quando uma for aberta" -#: ../src/interface.c:4035 +#: ../src/interface.c:4071 msgid "Square brackets [ ]" msgstr "Colchetes [ ]" -#: ../src/interface.c:4040 +#: ../src/interface.c:4076 msgid "Auto-close square-bracket when typing an opening one" msgstr "Fechar colchetes automaticamente ao digitar um colchete de abertura" -#: ../src/interface.c:4042 +#: ../src/interface.c:4078 msgid "Double quotes \" \"" msgstr "Aspas duplas \" \"" -#: ../src/interface.c:4047 +#: ../src/interface.c:4083 msgid "Auto-close double quote when typing an opening one" msgstr "Fechar aspas duplas automaticamente quando uma for aberta" -#: ../src/interface.c:4049 +#: ../src/interface.c:4085 msgid "<b>Auto-close quotes and brackets</b>" msgstr "<b>Fechar automaticamente aspas e delimitadores</b>" -#: ../src/interface.c:4054 +#: ../src/interface.c:4090 msgid "Completions" msgstr "Completações" -#: ../src/interface.c:4077 +#: ../src/interface.c:4113 msgid "Invert syntax highlighting colors" msgstr "Inverter as cores da destacação sintática" -#: ../src/interface.c:4080 +#: ../src/interface.c:4116 msgid "Invert all colors, by default using white text on a black background" msgstr "" "Inverter todas as cores, por padrão usar texto branco sobre um fundo preto" -#: ../src/interface.c:4082 +#: ../src/interface.c:4118 msgid "Show indentation guides" msgstr "Exibir guias de indentação" -#: ../src/interface.c:4085 +#: ../src/interface.c:4121 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Exibir pequenas linhas pontilhadas para ajudar no uso da endentação correta" +msgstr "Exibir pequenas linhas pontilhadas para ajudar no uso do recuo correto" -#: ../src/interface.c:4087 +#: ../src/interface.c:4123 msgid "Show white space" msgstr "Exibir espaços em branco" -#: ../src/interface.c:4090 +#: ../src/interface.c:4126 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca espaços com pontos e tabulações com setas" -#: ../src/interface.c:4092 +#: ../src/interface.c:4128 msgid "Show line endings" msgstr "Exibir final de linha" -#: ../src/interface.c:4095 +#: ../src/interface.c:4131 msgid "Shows the line ending character" msgstr "Exibe o caracter de fim de linha" -#: ../src/interface.c:4097 +#: ../src/interface.c:4133 msgid "Show line numbers" msgstr "Exibir números de linha" -#: ../src/interface.c:4100 +#: ../src/interface.c:4136 msgid "Shows or hides the Line Number margin" msgstr "Exibe ou esconde a margem de Números de Linhas" -#: ../src/interface.c:4102 +#: ../src/interface.c:4138 msgid "Show markers margin" msgstr "Exibir margem de marcadores" -#: ../src/interface.c:4105 +#: ../src/interface.c:4141 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2452,36 +2437,36 @@ "Exibe ou oculta a pequena margem à direita dos números de linhas, que é " "usada para marcar linhas" -#: ../src/interface.c:4107 +#: ../src/interface.c:4143 msgid "Stop scrolling at last line" msgstr "Parar a rolagem na última linha" -#: ../src/interface.c:4110 +#: ../src/interface.c:4146 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Parar ou não de rolar uma página após a última linha de um documento" -#: ../src/interface.c:4112 +#: ../src/interface.c:4148 msgid "<b>Display</b>" msgstr "<b>Exibição</b>" -#: ../src/interface.c:4133 ../src/interface.c:5531 +#: ../src/interface.c:4169 ../src/interface.c:5571 msgid "Column:" msgstr "Coluna:" -#: ../src/interface.c:4140 +#: ../src/interface.c:4176 msgid "Color:" msgstr "Cor:" -#: ../src/interface.c:4159 +#: ../src/interface.c:4195 msgid "Sets the color of the long line marker" msgstr "Define a cor do marcador de linha longa" -#: ../src/interface.c:4160 ../src/toolbar.c:71 ../src/tools.c:722 +#: ../src/interface.c:4196 ../src/toolbar.c:72 ../src/tools.c:722 #: ../src/vte.c:785 ../src/vte.c:792 msgid "Color Chooser" msgstr "Seletor de Cores" -#: ../src/interface.c:4168 +#: ../src/interface.c:4204 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2491,11 +2476,11 @@ "marcar as linhas longas, ou serve como dica para quebrar a linha. Definir um " "valor maior do que 0 especifica a coluna onde ela deve aparecer." -#: ../src/interface.c:4178 +#: ../src/interface.c:4214 msgid "Line" msgstr "Linha" -#: ../src/interface.c:4181 +#: ../src/interface.c:4217 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2503,11 +2488,11 @@ "Imprime uma linha vertical na janela do editor na posição do cursor " "informada (ver abaixo)" -#: ../src/interface.c:4185 +#: ../src/interface.c:4221 msgid "Background" msgstr "Fundo" -#: ../src/interface.c:4188 +#: ../src/interface.c:4224 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2517,27 +2502,27 @@ "abaixo) alterada para a cor definida abaixo (isso é recomendado se forem " "usadas fontes proporcionais)" -#: ../src/interface.c:4192 +#: ../src/interface.c:4228 msgid "Enabled" msgstr "Habilitar" -#: ../src/interface.c:4198 ../src/interface.c:5571 +#: ../src/interface.c:4234 ../src/interface.c:5611 msgid "<b>Long line marker</b>" msgstr "<b>Marcador de linha longa</b>" -#: ../src/interface.c:4217 ../src/interface.c:5538 +#: ../src/interface.c:4253 ../src/interface.c:5578 msgid "Disabled" msgstr "Desabilitado" -#: ../src/interface.c:4220 +#: ../src/interface.c:4256 msgid "Do not show virtual spaces" msgstr "Não exibir espaços virtuais" -#: ../src/interface.c:4224 +#: ../src/interface.c:4260 msgid "Only for rectangular selections" msgstr "Somente para seleções retangulares" -#: ../src/interface.c:4227 +#: ../src/interface.c:4263 msgid "" "Only show virtual spaces beyond the end of lines when drawing a rectangular " "selection" @@ -2545,53 +2530,53 @@ "Somente exibe espaços virtuais além do fim da linha quando estiver " "desenhando uma seleção retangular" -#: ../src/interface.c:4231 +#: ../src/interface.c:4267 msgid "Always" msgstr "Sempre" -#: ../src/interface.c:4234 +#: ../src/interface.c:4270 msgid "Always show virtual spaces beyond the end of lines" msgstr "Exibir sempre espaços virtuais além do final das linhas" -#: ../src/interface.c:4238 +#: ../src/interface.c:4274 msgid "<b>Virtual spaces</b>" msgstr "<b>Espaços virtuais</b>" -#: ../src/interface.c:4243 +#: ../src/interface.c:4279 msgid "Display" msgstr "Exibição" -#: ../src/interface.c:4274 +#: ../src/interface.c:4310 msgid "Open new documents from the command-line" msgstr "Abrir novos documentos a partir da linha de comando" -#: ../src/interface.c:4277 +#: ../src/interface.c:4313 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Iniciar um novo arquivo para cada nome de arquivo na linha de comando que " "não existe" -#: ../src/interface.c:4291 +#: ../src/interface.c:4327 msgid "Default end of line characters:" msgstr "Caracteres padrão de fim de linha:" -#: ../src/interface.c:4298 +#: ../src/interface.c:4334 msgid "<b>New files</b>" msgstr "<b>Novo arquivo</b>" -#: ../src/interface.c:4321 +#: ../src/interface.c:4357 msgid "Default encoding (new files):" msgstr "Codificação padrão (arquivos novos):" -#: ../src/interface.c:4329 +#: ../src/interface.c:4365 msgid "Sets the default encoding for newly created files" msgstr "Define a codificação padrão para arquivos novos" -#: ../src/interface.c:4335 +#: ../src/interface.c:4371 msgid "Use fixed encoding when opening non-Unicode files" msgstr "Usar codificação fixa quando abrir arquivos não Unicode" -#: ../src/interface.c:4338 +#: ../src/interface.c:4374 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " @@ -2601,93 +2586,94 @@ "abrir arquivos não Unicode e abre o arquivo com a codificação especificada " "(normalmente não necessário)" -#: ../src/interface.c:4344 +#: ../src/interface.c:4380 msgid "Default encoding (existing non-Unicode files):" msgstr "Codificação padrão (arquivos não Unicode existentes):" -#: ../src/interface.c:4352 +#: ../src/interface.c:4388 msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "Define a codificação padrão para abrir arquivos não Unicode existentes" -#: ../src/interface.c:4358 +#: ../src/interface.c:4394 msgid "<b>Encodings</b>" msgstr "<b>Codificações</b>" -#: ../src/interface.c:4377 +#: ../src/interface.c:4413 msgid "Ensure new line at file end" msgstr "Garantir nova linha no final do arquivo" -#: ../src/interface.c:4380 +#: ../src/interface.c:4416 msgid "Ensures that at the end of the file is a new line" msgstr "Garante que o final do arquivo é uma nova linha" -#: ../src/interface.c:4382 -#, fuzzy +#: ../src/interface.c:4418 msgid "Ensure consistent line endings" -msgstr "Garantir nova linha no final do arquivo" +msgstr "Garantir consistência de marcação de fim de linha" -#: ../src/interface.c:4385 +#: ../src/interface.c:4421 msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" +"Garante que caracteres de linha nova sempre sejam convertidos antes de " +"salvar,evitando arquivos com caracteres de fim de linha misturados" -#: ../src/interface.c:4387 +#: ../src/interface.c:4423 msgid "Strip trailing spaces and tabs" msgstr "Remover espaços e tabs no final" -#: ../src/interface.c:4390 +#: ../src/interface.c:4426 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Remove espaços e tabulações e finais de linha" -#: ../src/interface.c:4392 ../src/keybindings.c:518 +#: ../src/interface.c:4428 ../src/keybindings.c:519 msgid "Replace tabs by space" msgstr "Substituir tabs por espaços" -#: ../src/interface.c:4395 +#: ../src/interface.c:4431 msgid "Replaces all tabs in document by spaces" msgstr "Substitui todas as tabulações no documento por espaços" -#: ../src/interface.c:4397 +#: ../src/interface.c:4433 msgid "<b>Saving files</b>" msgstr "<b>Salvando arquivos</b>" -#: ../src/interface.c:4422 +#: ../src/interface.c:4458 msgid "Recent files list length:" msgstr "Tamanho da lista de arquivos recentes:" -#: ../src/interface.c:4436 +#: ../src/interface.c:4472 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Especifica o número de arquivos que são armazenados na lista de arquivos " "Recentes" -#: ../src/interface.c:4440 +#: ../src/interface.c:4476 msgid "Disk check timeout:" msgstr "Timeout de verificação de disco:" -#: ../src/interface.c:4453 +#: ../src/interface.c:4489 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -"Freqüência de verificação de mudanças em arquivos de documentos no disco, em " +"Frequência de verificação de mudanças em arquivos de documentos no disco, em " "segundos. Zero desabilita a verificação." -#: ../src/interface.c:4462 ../src/prefs.c:1559 ../src/symbols.c:605 +#: ../src/interface.c:4498 ../src/prefs.c:1559 ../src/symbols.c:605 #: ../plugins/filebrowser.c:1112 msgid "Files" msgstr "Arquivos" -#: ../src/interface.c:4495 +#: ../src/interface.c:4531 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4502 +#: ../src/interface.c:4538 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4514 +#: ../src/interface.c:4550 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2695,24 +2681,24 @@ "Um emulador de terminal como xterm, gnome-terminal ou konsole (deve aceitar " "o argumento -e)" -#: ../src/interface.c:4521 +#: ../src/interface.c:4557 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Caminho (e possivelmente argumentos adicionais) para o seu navegador favorito" -#: ../src/interface.c:4543 +#: ../src/interface.c:4579 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4566 +#: ../src/interface.c:4602 msgid "<b>Tool paths</b>" msgstr "<b>Caminhos de ferramentas</b>" -#: ../src/interface.c:4587 +#: ../src/interface.c:4623 msgid "Context action:" msgstr "Ação Contextual:" -#: ../src/interface.c:4598 +#: ../src/interface.c:4634 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2723,67 +2709,67 @@ "com %s. Ela pode estar em qualquer lugar do comando informado e será " "substituída antes da execução." -#: ../src/interface.c:4611 +#: ../src/interface.c:4647 msgid "<b>Commands</b>" msgstr "<b>Comandos</b>" -#: ../src/interface.c:4616 ../src/keybindings.c:556 ../src/prefs.c:1561 +#: ../src/interface.c:4652 ../src/keybindings.c:557 ../src/prefs.c:1561 msgid "Tools" msgstr "Ferramentas" -#: ../src/interface.c:4654 +#: ../src/interface.c:4690 msgid "email address of the developer" msgstr "Endereço de e-mail do desenvolvedor" -#: ../src/interface.c:4661 +#: ../src/interface.c:4697 msgid "Initials of the developer name" msgstr "Iniciais do nome do desenvolvedor" -#: ../src/interface.c:4663 +#: ../src/interface.c:4699 msgid "Initial version:" msgstr "Versão Inicial:" -#: ../src/interface.c:4675 +#: ../src/interface.c:4711 msgid "Version number, which a new file initially has" msgstr "Número de versão que um novo arquivo possui inicialmente" -#: ../src/interface.c:4682 +#: ../src/interface.c:4718 msgid "Company name" msgstr "Nome da empresa" -#: ../src/interface.c:4684 +#: ../src/interface.c:4720 msgid "Developer:" msgstr "Desenvolvedor:" -#: ../src/interface.c:4691 +#: ../src/interface.c:4727 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4698 +#: ../src/interface.c:4734 msgid "Mail address:" msgstr "Endereço:" -#: ../src/interface.c:4705 +#: ../src/interface.c:4741 msgid "Initials:" msgstr "Iniciais:" -#: ../src/interface.c:4717 +#: ../src/interface.c:4753 msgid "The name of the developer" msgstr "O nome do desenvolvedor" -#: ../src/interface.c:4719 +#: ../src/interface.c:4755 msgid "Year:" msgstr "Ano:" -#: ../src/interface.c:4726 +#: ../src/interface.c:4762 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4733 +#: ../src/interface.c:4769 msgid "Date & Time:" msgstr "Data & Hora:" -#: ../src/interface.c:4745 +#: ../src/interface.c:4781 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2792,7 +2778,7 @@ "especificador de conversão que pode ser usado com a função strftime do C " "ANSI." -#: ../src/interface.c:4752 +#: ../src/interface.c:4788 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2801,7 +2787,7 @@ "especificador de conversão que pode ser usado com a função strftime do C " "ANSI." -#: ../src/interface.c:4759 +#: ../src/interface.c:4795 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2810,63 +2796,63 @@ "especificador de conversão que pode ser usado com a função strftime do C " "ANSI." -#: ../src/interface.c:4761 +#: ../src/interface.c:4797 msgid "<b>Template data</b>" msgstr "<b>Dados de templates</b>" -#: ../src/interface.c:4766 ../src/prefs.c:1563 +#: ../src/interface.c:4802 ../src/prefs.c:1563 msgid "Templates" msgstr "Templates" -#: ../src/interface.c:4804 +#: ../src/interface.c:4840 msgid "C_hange" msgstr "_Alterar" -#: ../src/interface.c:4808 +#: ../src/interface.c:4844 msgid "<b>Keyboard shortcuts</b>" msgstr "<b>Atalhos de teclado</b>" -#: ../src/interface.c:4813 ../src/prefs.c:1565 +#: ../src/interface.c:4849 ../src/prefs.c:1565 msgid "Keybindings" msgstr "Ligações de teclas" -#: ../src/interface.c:4847 +#: ../src/interface.c:4883 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4854 +#: ../src/interface.c:4890 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Caminho para o comando de imprimir arquivos (usar %f para o nome do arquivo)" -#: ../src/interface.c:4864 +#: ../src/interface.c:4900 msgid "Use an external command for printing" msgstr "Usar um comando externo para imprimir" -#: ../src/interface.c:4884 ../src/printing.c:381 +#: ../src/interface.c:4920 ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimir números de linhas" -#: ../src/interface.c:4887 ../src/printing.c:383 +#: ../src/interface.c:4923 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Inclui números de linha à página impressa" -#: ../src/interface.c:4889 ../src/printing.c:386 +#: ../src/interface.c:4925 ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimir o número da página" -#: ../src/interface.c:4892 ../src/printing.c:388 +#: ../src/interface.c:4928 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Incluir números de páginas na base de cada página. Ocupa 2 linhas por página." -#: ../src/interface.c:4894 ../src/printing.c:391 +#: ../src/interface.c:4930 ../src/printing.c:391 msgid "Print page header" msgstr "Imprimir o cabeçalho da página" -#: ../src/interface.c:4897 ../src/printing.c:393 +#: ../src/interface.c:4933 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2874,19 +2860,19 @@ "Inclui um cabeçalho em cada página contendo o número da página, o nome do " "arquivo e a data atual (ver abaixo). Ocupa 3 linhas da página." -#: ../src/interface.c:4914 ../src/printing.c:409 +#: ../src/interface.c:4950 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usar o nome básico do arquivo impresso" -#: ../src/interface.c:4917 +#: ../src/interface.c:4953 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimir apenas o nome básico (sem o caminho) do arquivo impresso" -#: ../src/interface.c:4923 ../src/printing.c:417 +#: ../src/interface.c:4959 ../src/printing.c:417 msgid "Date format:" msgstr "Formato de Data:" -#: ../src/interface.c:4930 ../src/printing.c:423 +#: ../src/interface.c:4966 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2896,35 +2882,35 @@ "cabeçalho de cada página. Você pode usar qualquer especificador de conversão " "que pode ser usado com a função strftime do C ANSI." -#: ../src/interface.c:4933 +#: ../src/interface.c:4969 msgid "Use native GTK printing" msgstr "Usar impressão nativa do GTK" -#: ../src/interface.c:4939 +#: ../src/interface.c:4975 msgid "<b>Printing</b>" msgstr "<b>Impressão</b>" -#: ../src/interface.c:4944 ../src/prefs.c:1567 +#: ../src/interface.c:4980 ../src/prefs.c:1567 msgid "Printing" msgstr "Impressão" -#: ../src/interface.c:5406 +#: ../src/interface.c:5446 msgid "Project Properties" msgstr "Propriedades do Projeto" -#: ../src/interface.c:5524 +#: ../src/interface.c:5564 msgid "Display:" msgstr "Exibir:" -#: ../src/interface.c:5546 +#: ../src/interface.c:5586 msgid "Custom" msgstr "Personalizado" -#: ../src/interface.c:5554 +#: ../src/interface.c:5594 msgid "Use global settings" msgstr "Usar definições globais" -#: ../src/keybindings.c:220 ../src/plugins.c:1187 +#: ../src/keybindings.c:220 ../src/plugins.c:1193 msgid "File" msgstr "Arquivo" @@ -2944,7 +2930,7 @@ msgid "Save" msgstr "Salvar" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:232 ../src/toolbar.c:57 msgid "Save as" msgstr "Salvar como" @@ -3014,7 +3000,7 @@ #: ../src/keybindings.c:283 msgid "Suppress snippet completion" -msgstr "Suprimir completação de fragmento" +msgstr "Suprimir completamento de fragmento" #: ../src/keybindings.c:285 msgid "Context Action" @@ -3034,7 +3020,7 @@ #: ../src/keybindings.c:293 msgid "Word part completion" -msgstr "Completação de parte de palavra" +msgstr "Completar parte de palavra" #: ../src/keybindings.c:295 msgid "Move line(s) up" @@ -3106,11 +3092,11 @@ #: ../src/keybindings.c:350 msgid "Increase indent by one space" -msgstr "Aumentar endentação em um espaço" +msgstr "Aumentar recuo em um espaço" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5798] trunk/po
by frlan＠users.sourceforge.net 17 May '11

17 May '11

Revision: 5798 http://geany.svn.sourceforge.net/geany/?rev=5798&view=rev Author: frlan Date: 2011-05-17 20:35:27 +0000 (Tue, 17 May 2011) Log Message: ----------- Update of Slovenian translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sl.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-05-17 13:47:36 UTC (rev 5797) +++ trunk/po/ChangeLog 2011-05-17 20:35:27 UTC (rev 5798) @@ -1,3 +1,8 @@ +2011-05-17 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. + + 2011-04-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sv.po: Update of Swedish translation. Thanks to Tony Mattsson for Modified: trunk/po/sl.po =================================================================== --- trunk/po/sl.po 2011-05-17 13:47:36 UTC (rev 5797) +++ trunk/po/sl.po 2011-05-17 20:35:27 UTC (rev 5798) @@ -9,7 +9,7 @@ "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-12-05 15:55+0100\n" -"PO-Revision-Date: 2011-03-22 23:57+0100\n" +"PO-Revision-Date: 2011-05-12 21:11+0100\n" "Last-Translator: Jože Klepec <joze.klepec(a)siol.net>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" "Language: sl\n" @@ -508,7 +508,7 @@ #: ../src/dialogs.c:480 msgid "Overwrite?" -msgstr "Prepišem?" +msgstr "Se prepiše?" #: ../src/dialogs.c:481 msgid "Filename already exists!" @@ -832,7 +832,7 @@ #: ../src/document.c:2084 msgid "Wrap search and find again?" -msgstr "Zaključim iskanje v preostanku?" +msgstr "Se naj iskanje zaključi in ponovi v preostanku?" #: ../src/document.c:2163 #: ../src/search.c:1146 @@ -956,7 +956,7 @@ msgid "Arabic" msgstr "Arabsko" -# sploh ni na voljo, ? +# sploh ni na voljo, ? (je samo, potrebuješ nameščeno potrebno kodno stran) #. not available at all, ? #: ../src/encodings.c:104 #: ../src/encodings.c:106 @@ -992,6 +992,7 @@ msgid "Vietnamese" msgstr "Vietnamsko" +# available, original comment fails #. maybe not available on Linux #: ../src/encodings.c:129 #: ../src/encodings.c:130 @@ -1290,11 +1291,11 @@ #: ../src/interface.c:602 msgid "_Increase Indent" -msgstr "_Povečaj zamik" +msgstr "_Povečanje zamika" #: ../src/interface.c:610 msgid "_Decrease Indent" -msgstr "_Zmanjšaj zamik" +msgstr "_Zmanjšanje zamika" #: ../src/interface.c:618 #: ../src/keybindings.c:354 @@ -1856,7 +1857,7 @@ # puščen delno nepreveden, bo dodelan - fokus ni najboljši prevod; will be done later, left partially undone - goto line fields? #: ../src/interface.c:3105 msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." -msgstr "Samodejno dodeli fokus gradnikom pod miškinim kazalcem. Deluje za gradnike glavnega urejevalnika, beležko, iskanje iz orodne vrstice in VTE." +msgstr "Samodejno dodeli fokus gradnikom pod miškinim kazalcem. Deluje za gradnike glavnega urejevalnika, beležko, iskanje iz orodne vrstice in VTE." # Original needs rewording! #: ../src/interface.c:3107 @@ -1866,7 +1867,7 @@ # Original needs rewording! #: ../src/interface.c:3110 msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" -msgstr "Določi ali uporabite sistemska pogovorna okna ali privzeta GTK pogovorna okna" +msgstr "Določi ali uporabite sistemska pogovorna okna ali privzeta GTK pogovorna okna" #: ../src/interface.c:3112 #: ../src/interface.c:3491 @@ -2155,7 +2156,7 @@ #: ../src/interface.c:3701 msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." -msgstr "Zavije vrstico na robu okna in jo nadaljuje v naslednji. Opomba: zavijanje vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moralo biti onemogočen na počasnejših računalnikih. " +msgstr "Zavije vrstico na robu okna in jo nadaljuje v naslednji. Opomba: zavijanje vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moralo biti onemogočeno na počasnejših računalnikih. " #: ../src/interface.c:3703 msgid "\"Smart\" home key" @@ -2405,7 +2406,7 @@ #: ../src/interface.c:4047 msgid "Auto-close double quote when typing an opening one" -msgstr "Samodejno zapri dvojni narekovaje med tipkanjem" +msgstr "Samodejno zapri dvojne narekovaje med tipkanjem" #: ../src/interface.c:4049 msgid "<b>Auto-close quotes and brackets</b>" @@ -4901,7 +4902,7 @@ #: ../src/vte.c:847 msgid "Override Geany keybindings" -msgstr "Zanemari bližnjice Geany-ja" +msgstr "Zanemari bližnjice Geany-ja" #: ../src/vte.c:849 msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" @@ -4913,7 +4914,7 @@ #: ../src/vte.c:853 msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." -msgstr "Ta možnost onemogoči bližnjico pojavljanja menijske vrstice (privzeto - F10). Onemogočenje je lahko uporabno, če na primer, uporabljate Midnight Comander znotraj VTE." +msgstr "Ta možnost onemogoči hitre povezave s tipkami (bližnjice) pojavljanja menijske vrstice (privzeto - F10). Onemogočenje je lahko uporabno, če na primer, uporabljate Midnight Comander znotraj VTE." #: ../src/vte.c:856 #: ../plugins/filebrowser.c:1228 @@ -5347,9 +5348,10 @@ msgid "Select Directory" msgstr "Izberite mapo" +# Backup directory does not exist or you do not have write access to write into it. :) #: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." -msgstr "Mapa varnostne kopije ne obstaja ali ni zapisljiva." +msgstr "Mapa varnostne kopije ne obstaja ali nimate dostopa za pisanje vanjo." #: ../plugins/saveactions.c:543 msgid "Auto Save" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011