Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

SF.net SVN: geany:[3248] trunk
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3248 http://geany.svn.sourceforge.net/geany/?rev=3248&view=rev Author: eht16 Date: 2008-11-18 20:13:29 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Show the full filename of a document as tooltip on the tab labels. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/document.h trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 17:46:24 UTC (rev 3247) +++ trunk/ChangeLog 2008-11-18 20:13:29 UTC (rev 3248) @@ -6,6 +6,8 @@ * doc/geany.txt, doc/geany.html: Fix some typos. Add note about the encoding box in the Find in Files dialog. + * src/document.c, src/document.h, src/notebook.c: + Show the full filename of a document as tooltip on the tab labels. 2008-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-11-18 17:46:24 UTC (rev 3247) +++ trunk/src/document.c 2008-11-18 20:13:29 UTC (rev 3248) @@ -275,6 +275,24 @@ } +void document_update_tab_label(GeanyDocument *doc) +{ + gchar *base_name = g_path_get_basename(doc->file_name); + GtkWidget *parent = gtk_widget_get_parent(doc->priv->tab_label); + static GtkTooltips *tooltips = NULL; + + if (tooltips == NULL) + tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + + gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); + gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); + + gtk_tooltips_set_tip(tooltips, parent, doc->file_name, NULL); + + g_free(base_name); +} + + /** * Update the tab labels, the status bar, the window title and some save-sensitive buttons * according to the document's save state. @@ -1538,8 +1556,6 @@ /* ignore the following things if we are quitting */ if (! main_status.quitting) { - gchar *base_name = g_path_get_basename(doc->file_name); - sci_set_savepoint(doc->editor->sci); /* stat the file to get the timestamp, otherwise on Windows the actual @@ -1551,12 +1567,10 @@ tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); - gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); - gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); + document_update_tab_label(doc); msgwin_status_add(_("File %s saved."), doc->file_name); ui_update_statusbar(doc, -1); - g_free(base_name); #ifdef HAVE_VTE vte_cwd(doc->file_name, FALSE); #endif Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-11-18 17:46:24 UTC (rev 3247) +++ trunk/src/document.h 2008-11-18 20:13:29 UTC (rev 3248) @@ -224,6 +224,7 @@ void document_undo_add(GeanyDocument *doc, guint type, gpointer data); +void document_update_tab_label(GeanyDocument *doc); GdkColor *document_get_status_color(GeanyDocument *doc); Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-11-18 17:46:24 UTC (rev 3247) +++ trunk/src/notebook.c 2008-11-18 20:13:29 UTC (rev 3248) @@ -450,7 +450,7 @@ page = GTK_WIDGET(this->editor->sci); title = g_path_get_basename(DOC_FILENAME(this)); - this->priv->tab_label = gtk_label_new(title); + this->priv->tab_label = gtk_label_new(NULL); ebox = gtk_event_box_new(); GTK_WIDGET_SET_FLAGS(ebox, GTK_NO_WINDOW); @@ -464,7 +464,6 @@ { GtkWidget *image, *btn, *align; GtkRcStyle *rcstyle; - GtkRequisition size; btn = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE); @@ -491,9 +490,11 @@ gtk_widget_show_all(hbox); - this->priv->tabmenu_label = gtk_label_new(title); + this->priv->tabmenu_label = gtk_label_new(NULL); gtk_misc_set_alignment(GTK_MISC(this->priv->tabmenu_label), 0.0, 0); + document_update_tab_label(this); + if (file_prefs.tab_order_ltr) tabnum = gtk_notebook_append_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, hbox, this->priv->tabmenu_label); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3247] trunk
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3247 http://geany.svn.sourceforge.net/geany/?rev=3247&view=rev Author: eht16 Date: 2008-11-18 17:46:24 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Fix some typos. Add note about the encoding box in the Find in Files dialog. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 17:24:10 UTC (rev 3246) +++ trunk/ChangeLog 2008-11-18 17:46:24 UTC (rev 3247) @@ -3,6 +3,9 @@ * src/notebook.c: Remove forced size requests for the tab close icon as it seems not necessary and broke the icon on Windows. + * doc/geany.txt, doc/geany.html: + Fix some typos. + Add note about the encoding box in the Find in Files dialog. 2008-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-11-18 17:24:10 UTC (rev 3246) +++ trunk/doc/geany.html 2008-11-18 17:46:24 UTC (rev 3247) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: 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="2008-11-13" /> <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>2008-11-13</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.16</td></tr> </tbody> @@ -203,7 +203,7 @@ <li><a class="reference internal" href="#send-text-through-definable-commands" id="id44">Send text through definable commands</a></li> <li><a class="reference internal" href="#context-actions" id="id45">Context actions</a></li> <li><a class="reference internal" href="#user-definable-snippets" id="id46">User-definable snippets</a></li> -<li><a class="reference internal" href="#inserting-unicode-characters" id="id47">Inserting unicode characters</a></li> +<li><a class="reference internal" href="#inserting-unicode-characters" id="id47">Inserting Unicode characters</a></li> </ul> </li> <li><a class="reference internal" href="#search-replace-and-go-to" id="id48">Search, replace and go to</a><ul> @@ -351,7 +351,7 @@ </li> <li><a class="reference internal" href="#filetype-extensions" id="id139">Filetype extensions</a></li> <li><a class="reference internal" href="#templates" id="id140">Templates</a><ul> -<li><a class="reference internal" href="#template-metadata" id="id141">Template metadata</a></li> +<li><a class="reference internal" href="#template-meta-data" id="id141">Template meta data</a></li> <li><a class="reference internal" href="#file-templates" id="id142">File templates</a><ul> <li><a class="reference internal" href="#custom-file-templates" id="id143">Custom file templates</a></li> <li><a class="reference internal" href="#filetype-templates" id="id144">Filetype templates</a></li> @@ -624,7 +624,7 @@ <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 -only needed when the autodetection does not work. Only +only needed when the auto detection does not work. Only available if Geany was compiled with support for VTE.</td> </tr> <tr><td>-v</td> @@ -640,7 +640,7 @@ <td><p class="first">Open all given files at startup. This option causes Geany to ignore loading stored files from the last session (if enabled). -Geany also recognises line and column information when +Geany also recognizes line and column information when appended to the filename with colons, e.g. "geany foo.bar:10:5" will open the file foo.bar and place the cursor in line 10 at column 5.</p> @@ -794,9 +794,9 @@ can convert a file from a character set to another one. To do this, Geany uses the character conversion capabilities of the GLib.</p> <p>Only text files are supported, i.e. opening files which contain -NUL-bytes may fail. Geany will try to open the file anyway but it is +NULL-bytes may fail. Geany will try to open the file anyway but it is likely that the file will be truncated because it can only opened up -to the first occurrence of a NUL-byte. All characters after this +to the first occurrence of a NULL-byte. All characters after this position are lost and are not written when you save the file.</p> <p>Geany tries to detect the encoding of a file while opening it. It might be that the encoding of a file cannot be detected correctly so @@ -872,7 +872,7 @@ <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. -Anything after the first 512 bytes will not be recognised.</p> +Anything after the first 512 bytes will not be recognized.</p> </div> </div> <div class="section" id="special-encoding-none"> @@ -880,16 +880,16 @@ <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially -when the file contains NUL-bytes this can be useful to skip auto +when the file contains NULL-bytes this can be useful to skip auto detection and open the file properly at least until the occurrence -of the first NUL-byte. Using this encoding opens the file as it is +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="#id35">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an 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, -this feature is only available if the opened file is in an unicode +this feature is only available if the opened file is in an 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 using a Byte Order Mark could cause some problems, e.g. the gcc stops @@ -1149,7 +1149,7 @@ [Default] myname=Enrico Tröger </pre> -<p>Everytime 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"><span class="pre">myname</span></tt> <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start auto completion can be changed in the preferences dialog, by default it is TAB.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards @@ -1169,7 +1169,7 @@ needs.</p> </div> <div class="section" id="inserting-unicode-characters"> -<h3><a class="toc-backref" href="#id47">Inserting unicode characters</a></h3> +<h3><a class="toc-backref" href="#id47">Inserting Unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as @@ -1209,8 +1209,8 @@ <a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into -a tab character. Other recognised symbols are: \\, \n, \r, \uXXXX -(Unicode chararacters).</p> +a tab character. Other recognized symbols are: \\, \n, \r, \uXXXX +(Unicode characters).</p> </div> <div class="section" id="find-all"> <h4><a class="toc-backref" href="#id51">Find all</a></h4> @@ -1225,13 +1225,13 @@ current document in the Messages tab of the Message Window. <em>Find All In Session</em> does the same for all open documents.</p> <p>Mark will highlight all matches in the current document with a -coloured box. These markers can be removed by selecting the +colored box. These markers can be removed by selecting the Remove Markers command from the Document menu.</p> </div> <div class="section" id="change-font-in-search-dialog-text-fields"> <h4><a class="toc-backref" href="#id52">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to -increase the readibility of input text. This is useful when you are +increase the readability of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which might it hard to read with a proportional font.</p> <p>If you want to change the font for some reason, you can do this easily @@ -1267,7 +1267,10 @@ must be correctly set in Preferences to the path of the system's Grep utility. GNU Grep is recommended.</p> <img alt="./images/find_in_files_dialog.png" src="./images/find_in_files_dialog.png" /> -<p>The Extra options field is used to pass any additional arguments to +<p>The Encoding combo box can be used to define the encoding of the files +to be searched. The chosen encoding is used to convert the entered search +text into and to convert the search results back to UTF-8. +The Extra options field is used to pass any additional arguments to the grep tool.</p> <div class="section" id="filtering-out-version-control-files"> <h4><a class="toc-backref" href="#id55">Filtering out version control files</a></h4> @@ -1419,14 +1422,14 @@ <h3><a class="toc-backref" href="#id64">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 +are also used for auto completion 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> <div class="section" id="global-tags"> <h3><a class="toc-backref" href="#id65">Global tags</a></h3> -<p>Global tags are used to provide autocompletion of symbols and calltips +<p>Global tags are used to provide auto completion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade the library.</p> @@ -1516,7 +1519,7 @@ Specifies a list of identifiers which are to be specially handled while parsing C and C++ source files. This option is specifically provided to handle special cases arising through the use of -preprocessor macros. When the identifiers listed are simple identifiers, +pre-processor macros. When the identifiers listed are simple identifiers, these identifiers will be ignored during parsing of the source files. If an identifier is suffixed with a '+' character, ctags will also ignore any parenthesis-enclosed argument list which may immediately @@ -2005,7 +2008,7 @@ </div> <div class="section" id="template-tab-in-preferences-dialog"> <h3><a class="toc-backref" href="#id100">Template tab in preferences dialog</a></h3> -<p>This data is used as metadata for various template text to insert into +<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> <div class="note"> @@ -2324,7 +2327,7 @@ <div class="section" id="indicators"> <h3><a class="toc-backref" href="#id124">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight -errors which occured while compiling the current file. So you can +errors which occurred while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, just click on "Remove all indicators" in the document file menu.</p> <p>If you do not like this feature, you can disable it in the preferences @@ -2579,7 +2582,7 @@ <tr><td>Context Action</td> <td> </td> <td>Executes a command and passes the current word -(near the cursor postion) or selection as an +(near the cursor position) or selection as an argument. See the section called <a class="reference internal" href="#context-actions">Context actions</a>.</td> </tr> @@ -3014,7 +3017,7 @@ </tr> <tr><td>Show Color Chooser</td> <td> </td> -<td>Opens the Colour Chooser dialog.</td> +<td>Opens the Color Chooser dialog.</td> </tr> <tr><td><strong>Help</strong></td> <td> </td> @@ -3053,8 +3056,8 @@ </div> <div class="section" id="filetype-definition-files"> <h2><a class="toc-backref" href="#id132">Filetype definition files</a></h2> -<p>All colour definitions and other filetype specific settings are -stored in the filetype definition files. Those settings are colours +<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>The system-wide configuration files can be found in @@ -3083,9 +3086,9 @@ <h3><a class="toc-backref" href="#id133">Format</a></h3> <div class="section" id="styling-section"> <h4><a class="toc-backref" href="#id134">[styling] Section</a></h4> -<p>In this section the colours for syntax highlighting are defined. The -format is always: key=forground_colour;background_colour;bold;italic</p> -<p>Colours have to be specified as RGB hex values prefixed by +<p>In this section the colors for syntax highlighting are defined. The +format is always: key=foreground_color;background_color;bold;italic</p> +<p>Colors have to be specified as RGB hex values prefixed by 0x. For example red is 0xff0000, blue is 0x0000ff. The values are case-insensitive, but it is a good idea to use small letters. Bold and italic are flags and should only be "true" or "false". If their @@ -3224,15 +3227,15 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">default=0x000000;0xffffff;false;false</span></tt></p> </dd> <dt>selection</dt> -<dd><p class="first">The style for colouring selected text. The format is:</p> +<dd><p class="first">The style for coloring selected text. The format is:</p> <ul class="simple"> -<li>Foreground colour</li> -<li>Background colour</li> -<li>Use foreground colour</li> -<li>Use background colour</li> +<li>Foreground color</li> +<li>Background color</li> +<li>Use foreground color</li> +<li>Use background color</li> </ul> -<p>The colours are only set if the 3rd or 4th argument is true. When -the colours are not overridden, the default is a dark grey +<p>The colors are only set if the 3rd or 4th argument is true. When +the colors are not overridden, the default is a dark grey background with syntax highlighted foreground text.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">selection=0xc0c0c0;0x00007F;true;true</span></tt></p> </dd> @@ -3245,7 +3248,7 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">brace_bad=0x0000ff;0xFFFFFF;true;false</span></tt></p> </dd> <dt>caret</dt> -<dd><p class="first">The style for colouring the caret(the blinking cursor). Only first +<dd><p class="first">The style for coloring the caret(the blinking cursor). Only first and third argument is interpreted. Set the third argument to true to change the caret into a block caret.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">caret=0x000000;0x0;false;false</span></tt></p> @@ -3258,24 +3261,24 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">caret=1;0;false;false</span></tt></p> </dd> <dt>current_line</dt> -<dd><p class="first">The style for colouring the background of the current line. Only +<dd><p class="first">The style for coloring the background of the current line. Only the second and third arguments are interpreted. The second argument -is the background colour. Use the third argument to enable or +is the background color. Use the third argument to enable or disable background highlighting for the current line (has to be true/false).</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">current_line=0x0;0xe5e5e5;true;false</span></tt></p> </dd> <dt>indent_guide</dt> -<dd><p class="first">The style for colouring the indentation guides. Only the first and +<dd><p class="first">The style for coloring the indentation guides. Only the first and second arguments are interpreted.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">indent_guide=0xc0c0c0;0xffffff;false;false</span></tt></p> </dd> <dt>white_space</dt> -<dd><p class="first">The style for colouring the white space if it is shown. The first -both arguments define the foreground and background colours, the -third argument sets whether to use the defined foreground colour -or to use the colour defined by each filetype for the white space. -The fourth argument defines whether to use the background colour.</p> +<dd><p class="first">The style for coloring the white space if it is shown. The first +both arguments define the foreground and background colors, the +third argument sets whether to use the defined foreground color +or to use the color defined by each filetype for the white space. +The fourth argument defines whether to use the background color.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">white_space=0xc0c0c0;0xffffff;true;true</span></tt></p> </dd> <dt>folding_style</dt> @@ -3305,12 +3308,12 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">folding_horiz_line=0;0;false;false</span></tt></p> </dd> <dt>invert_all</dt> -<dd><p class="first">Whether to invert all defined colours. This is useful if you like a -dark background colour(e.g. black) and do not want to change every +<dd><p class="first">Whether to invert all defined colors. This is useful if you like a +dark background color(e.g. black) and do not want to change every single line. Please note, at time of writing this was only tested with the C syntax highlighting.</p> <p>Only first argument is interpreted. Set it to 1 to invert all -colours.</p> +colors.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">invert_all=0;0;false;false</span></tt></p> </dd> <dt>line_wrap_visuals</dt> @@ -3348,14 +3351,14 @@ </dd> <dt>marker_line</dt> <dd><p class="first">The style for a highlighted line (e.g when using Goto line or goto tag). -The forground colour (first argument) is only used when the Markers margin +The foreground color (first argument) is only used when the Markers margin is enabled (see View menu).</p> <p>Only the first and second argument is interpreted.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_line=0x000000;0xffff00;false;false</span></tt></p> </dd> <dt>marker_search</dt> <dd><p class="first">The style for a highlighted search result (e.g when using "Mark" in -Search dialogs). The foreground colour (first argument) is only used +Search dialogs). The foreground color (first argument) is only used when the Markers margin is enabled (see View menu).</p> <p>Only the first and second argument is interpreted.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_search=0x000000;0xB8F4B8;false;false</span></tt></p> @@ -3427,10 +3430,10 @@ of a function or the function name cannot be determined, the inserted function description won't contain the correct function name but "unknown" instead.</p> -<div class="section" id="template-metadata"> -<h3><a class="toc-backref" href="#id141">Template metadata</a></h3> -<p>Metadata can be used with all templates, but by default user set -metadata is only used for the ChangeLog and File header templates.</p> +<div class="section" id="template-meta-data"> +<h3><a class="toc-backref" href="#id141">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 <a class="reference internal" href="#template-tab-in-preferences-dialog">Template tab in preferences dialog</a>). You can define the default values which will be inserted in the templates. You should @@ -4412,7 +4415,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2008-11-13 14:09 UTC. +Generated on: 2008-11-18 17:43 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: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-11-18 17:24:10 UTC (rev 3246) +++ trunk/doc/geany.txt 2008-11-18 17:46:24 UTC (rev 3247) @@ -245,7 +245,7 @@ *none* --vte-lib Specify explicitly the path including filename or only the filename to the VTE library, e.g. ``/usr/lib/libvte.so`` or ``libvte.so``. This option is - only needed when the autodetection does not work. Only + only needed when the auto detection does not work. Only available if Geany was compiled with support for VTE. -v --version Show version information and exit. @@ -255,7 +255,7 @@ *none* [files ...] Open all given files at startup. This option causes Geany to ignore loading stored files from the last session (if enabled). - Geany also recognises line and column information when + Geany also recognizes line and column information when appended to the filename with colons, e.g. "geany foo.bar:10:5" will open the file foo.bar and place the cursor in line 10 at column 5. @@ -432,9 +432,9 @@ Geany uses the character conversion capabilities of the GLib. Only text files are supported, i.e. opening files which contain -NUL-bytes may fail. Geany will try to open the file anyway but it is +NULL-bytes may fail. Geany will try to open the file anyway but it is likely that the file will be truncated because it can only opened up -to the first occurrence of a NUL-byte. All characters after this +to the first occurrence of a NULL-byte. All characters after this position are lost and are not written when you save the file. Geany tries to detect the encoding of a file while opening it. It @@ -517,7 +517,7 @@ .. note:: These specifications must be in the first 512 bytes of the file. - Anything after the first 512 bytes will not be recognised. + Anything after the first 512 bytes will not be recognized. Special encoding "None" @@ -526,9 +526,9 @@ There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially -when the file contains NUL-bytes this can be useful to skip auto +when the file contains NULL-bytes this can be useful to skip auto detection and open the file properly at least until the occurrence -of the first NUL-byte. Using this encoding opens the file as it is +of the first NULL-byte. Using this encoding opens the file as it is without any character conversion. @@ -537,7 +537,7 @@ Furthermore, Geany detects an Unicode Byte Order Mark (see http://en.wikipedia.org/wiki/Byte_Order_Mark for details). Of course, -this feature is only available if the opened file is in an unicode +this feature is only available if the opened file is in an 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 using a Byte Order Mark could cause some problems, e.g. the gcc stops @@ -823,7 +823,7 @@ [Default] myname=Enrico Tröger -Everytime you write ``myname`` <TAB> in Geany, it will replace "myname" +Every time you write ``myname`` <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start auto completion can be changed in the preferences dialog, by default it is TAB. @@ -845,7 +845,7 @@ needs. -Inserting unicode characters +Inserting Unicode characters ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding @@ -899,8 +899,8 @@ The Use escape sequences option will transform any escaped characters into their UTF-8 equivalent. For example, \\t will be transformed into -a tab character. Other recognised symbols are: \\\\, \\n, \\r, \\uXXXX -(Unicode chararacters). +a tab character. Other recognized symbols are: \\\\, \\n, \\r, \\uXXXX +(Unicode characters). Find all @@ -918,7 +918,7 @@ In Session* does the same for all open documents. Mark will highlight all matches in the current document with a -coloured box. These markers can be removed by selecting the +colored box. These markers can be removed by selecting the Remove Markers command from the Document menu. @@ -926,7 +926,7 @@ ```````````````````````````````````````` All search related dialogs use a Monospace for the text input fields to -increase the readibility of input text. This is useful when you are +increase the readability of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which might it hard to read with a proportional font. @@ -970,6 +970,9 @@ .. image:: ./images/find_in_files_dialog.png +The Encoding combo box can be used to define the encoding of the files +to be searched. The chosen encoding is used to convert the entered search +text into and to convert the search results back to UTF-8. The Extra options field is used to pass any additional arguments to the grep tool. @@ -1129,7 +1132,7 @@ 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 +are also used for auto completion 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 @@ -1139,7 +1142,7 @@ Global tags ^^^^^^^^^^^ -Global tags are used to provide autocompletion of symbols and calltips +Global tags are used to provide auto completion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade the library. @@ -1244,7 +1247,7 @@ Specifies a list of identifiers which are to be specially handled while parsing C and C++ source files. This option is specifically provided to handle special cases arising through the use of - preprocessor macros. When the identifiers listed are simple identifiers, + pre-processor macros. When the identifiers listed are simple identifiers, these identifiers will be ignored during parsing of the source files. If an identifier is suffixed with a '+' character, ctags will also ignore any parenthesis-enclosed argument list which may immediately @@ -1789,7 +1792,7 @@ Template tab in preferences dialog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -This data is used as metadata for various template text to insert into +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. @@ -2186,7 +2189,7 @@ ^^^^^^^^^^ Indicators are red squiggly underlines which are used to highlight -errors which occured while compiling the current file. So you can +errors which occurred while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, just click on "Remove all indicators" in the document file menu. @@ -2383,7 +2386,7 @@ insert a space. Context Action Executes a command and passes the current word - (near the cursor postion) or selection as an + (near the cursor position) or selection as an argument. See the section called `Context actions`_. @@ -2630,7 +2633,7 @@ **Tools** -Show Color Chooser Opens the Colour Chooser dialog. +Show Color Chooser Opens the Color Chooser dialog. **Help** @@ -2670,8 +2673,8 @@ Filetype definition files ------------------------- -All colour definitions and other filetype specific settings are -stored in the filetype definition files. Those settings are colours +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. @@ -2708,10 +2711,10 @@ [styling] Section ````````````````` -In this section the colours for syntax highlighting are defined. The -format is always: key=forground_colour;background_colour;bold;italic +In this section the colors for syntax highlighting are defined. The +format is always: key=foreground_color;background_color;bold;italic -Colours have to be specified as RGB hex values prefixed by +Colors have to be specified as RGB hex values prefixed by 0x. For example red is 0xff0000, blue is 0x0000ff. The values are case-insensitive, but it is a good idea to use small letters. Bold and italic are flags and should only be "true" or "false". If their @@ -2866,15 +2869,15 @@ *Example:* ``default=0x000000;0xffffff;false;false`` selection - The style for colouring selected text. The format is: + The style for coloring selected text. The format is: - * Foreground colour - * Background colour - * Use foreground colour - * Use background colour + * Foreground color + * Background color + * Use foreground color + * Use background color - The colours are only set if the 3rd or 4th argument is true. When - the colours are not overridden, the default is a dark grey + The colors are only set if the 3rd or 4th argument is true. When + the colors are not overridden, the default is a dark grey background with syntax highlighted foreground text. *Example:* ``selection=0xc0c0c0;0x00007F;true;true`` @@ -2890,7 +2893,7 @@ *Example:* ``brace_bad=0x0000ff;0xFFFFFF;true;false`` caret - The style for colouring the caret(the blinking cursor). Only first + The style for coloring the caret(the blinking cursor). Only first and third argument is interpreted. Set the third argument to true to change the caret into a block caret. @@ -2905,26 +2908,26 @@ *Example:* ``caret=1;0;false;false`` current_line - The style for colouring the background of the current line. Only + The style for coloring the background of the current line. Only the second and third arguments are interpreted. The second argument - is the background colour. Use the third argument to enable or + is the background color. Use the third argument to enable or disable background highlighting for the current line (has to be true/false). *Example:* ``current_line=0x0;0xe5e5e5;true;false`` indent_guide - The style for colouring the indentation guides. Only the first and + The style for coloring the indentation guides. Only the first and second arguments are interpreted. *Example:* ``indent_guide=0xc0c0c0;0xffffff;false;false`` white_space - The style for colouring the white space if it is shown. The first - both arguments define the foreground and background colours, the - third argument sets whether to use the defined foreground colour - or to use the colour defined by each filetype for the white space. - The fourth argument defines whether to use the background colour. + The style for coloring the white space if it is shown. The first + both arguments define the foreground and background colors, the + third argument sets whether to use the defined foreground color + or to use the color defined by each filetype for the white space. + The fourth argument defines whether to use the background color. *Example:* ``white_space=0xc0c0c0;0xffffff;true;true`` @@ -2957,13 +2960,13 @@ *Example:* ``folding_horiz_line=0;0;false;false`` invert_all - Whether to invert all defined colours. This is useful if you like a - dark background colour(e.g. black) and do not want to change every + Whether to invert all defined colors. This is useful if you like a + dark background color(e.g. black) and do not want to change every single line. Please note, at time of writing this was only tested with the C syntax highlighting. Only first argument is interpreted. Set it to 1 to invert all - colours. + colors. *Example:* ``invert_all=0;0;false;false`` @@ -3008,7 +3011,7 @@ marker_line The style for a highlighted line (e.g when using Goto line or goto tag). - The forground colour (first argument) is only used when the Markers margin + The foreground color (first argument) is only used when the Markers margin is enabled (see View menu). Only the first and second argument is interpreted. @@ -3017,7 +3020,7 @@ marker_search The style for a highlighted search result (e.g when using "Mark" in - Search dialogs). The foreground colour (first argument) is only used + Search dialogs). The foreground color (first argument) is only used when the Markers margin is enabled (see View menu). Only the first and second argument is interpreted. @@ -3106,11 +3109,11 @@ instead. -Template metadata -^^^^^^^^^^^^^^^^^ +Template meta data +^^^^^^^^^^^^^^^^^^ -Metadata can be used with all templates, but by default user set -metadata is only used for the ChangeLog and File header templates. +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. In the configuration dialog you can find a tab "Templates" (see `Template tab in preferences dialog`_). You can define the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3246] trunk
by ntrel＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3246 http://geany.svn.sourceforge.net/geany/?rev=3246&view=rev Author: ntrel Date: 2008-11-18 17:24:10 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Update utils_free_pointers(). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 17:14:00 UTC (rev 3245) +++ trunk/ChangeLog 2008-11-18 17:24:10 UTC (rev 3246) @@ -1,4 +1,4 @@ -2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +2008-11-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/notebook.c: Remove forced size requests for the tab close icon as it seems not @@ -17,6 +17,8 @@ src/project.c, src/search.c, src/editor.c: Make utils_free_pointers() take an arg_count argument to prevent memory leaks. + * plugins/classbuilder.c: + Update utils_free_pointers(). 2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2008-11-18 17:14:00 UTC (rev 3245) +++ trunk/plugins/classbuilder.c 2008-11-18 17:24:10 UTC (rev 3246) @@ -223,27 +223,24 @@ static void cc_dlg_on_create_class(CreateClassDialog *cc_dlg); -/* I don't want this to be in the plugin API because it can cause leaks if any pointers - * are NULL -ntrel. */ -/* Frees all passed pointers if they are *ALL* non-NULL. - * Do not use if any pointers may be NULL. - * The first argument is nothing special, it will also be freed. - * The list must be ended with NULL. */ +/* The list must be ended with NULL as an extra check that arg_count is correct. */ static void -utils_free_pointers(gpointer first, ...) +utils_free_pointers(gsize arg_count, ...) { va_list a; - gpointer sa; + gsize i; + gpointer ptr; - for (va_start(a, first); (sa = va_arg(a, gpointer), sa!=NULL);) - { - if (sa != NULL) - g_free(sa); + va_start(a, arg_count); + for (i = 0; i < arg_count; i++) + { + ptr = va_arg(a, gpointer); + g_free(ptr); } + ptr = va_arg(a, gpointer); + if (ptr) + g_warning("Wrong arg_count!"); va_end(a); - - if (first != NULL) - g_free(first); } @@ -748,7 +745,7 @@ g_free(text); } - utils_free_pointers(tmp, class_info->class_name, class_info->class_name_up, + utils_free_pointers(17, tmp, class_info->class_name, class_info->class_name_up, class_info->base_name, class_info->class_name_low, class_info->base_include, class_info->header, class_info->header_guard, class_info->source, class_info->base_decl, class_info->constructor_decl, class_info->constructor_impl, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3245] trunk
by ntrel＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3245 http://geany.svn.sourceforge.net/geany/?rev=3245&view=rev Author: ntrel Date: 2008-11-18 17:14:00 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Make utils_free_pointers() take an arg_count argument to prevent memory leaks. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/editor.c trunk/src/project.c trunk/src/search.c trunk/src/templates.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/ChangeLog 2008-11-18 17:14:00 UTC (rev 3245) @@ -13,6 +13,10 @@ src/symbols.h: Move symbol list popup menu code to symbols.c. Add symbols_init(). + * src/templates.c, src/build.c, src/utils.c, src/utils.h, + src/project.c, src/search.c, src/editor.c: + Make utils_free_pointers() take an arg_count argument to prevent + memory leaks. 2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/build.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -178,7 +178,7 @@ if (g_stat(locale_filename, &st) != 0) { ui_set_statusbar(TRUE, _("Failed to view %s (make sure it is already compiled)"), view_file); - utils_free_pointers(executable, view_file, locale_filename, NULL); + utils_free_pointers(3, executable, view_file, locale_filename, NULL); return (GPid) 1; } @@ -213,7 +213,7 @@ _("Could not find terminal \"%s\" " "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); - utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, NULL); g_strfreev(term_argv); return (GPid) 1; @@ -227,7 +227,7 @@ { ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), executable); - utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, working_dir, NULL); g_strfreev(term_argv); return (GPid) 1; @@ -264,7 +264,7 @@ geany_debug("g_spawn_async() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); - utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); @@ -280,7 +280,7 @@ build_menu_update(doc); } - utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); @@ -641,7 +641,7 @@ gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir); ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), utf8_working_dir); - utils_free_pointers(utf8_working_dir, working_dir, executable, locale_filename, NULL); + utils_free_pointers(4, utf8_working_dir, working_dir, executable, locale_filename, NULL); return NULL; } @@ -660,7 +660,7 @@ if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = cmd; - utils_free_pointers(executable, locale_filename, NULL); + utils_free_pointers(2, executable, locale_filename, NULL); return working_dir; } else @@ -682,7 +682,7 @@ g_free(utf8_cmd); } - utils_free_pointers(tmp, cmd, executable, locale_filename, NULL); + utils_free_pointers(4, tmp, cmd, executable, locale_filename, NULL); if (result) return working_dir; Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/editor.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -1686,7 +1686,7 @@ text = templates_replace_all(text, year, date, datetime); text = utils_str_replace(text, "{filename}", basename); - utils_free_pointers(year, date, datetime, basename, NULL); + utils_free_pointers(4, year, date, datetime, basename, NULL); return text; } @@ -1799,7 +1799,7 @@ pattern = snippets_find_completion_by_name(filetypes[ft_id]->name, str); if (pattern == NULL || pattern[0] == '\0') { - utils_free_pointers(str, pattern, NULL); /* free pattern in case it is "" */ + utils_free_pointers(2, str, pattern, NULL); /* free pattern in case it is "" */ return FALSE; } @@ -1839,7 +1839,7 @@ editor_insert_text_block(editor, pattern, pos, cur_index, -1); sci_scroll_caret(sci); - utils_free_pointers(pattern, str, NULL); + utils_free_pointers(2, pattern, str, NULL); return TRUE; } Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/project.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -627,7 +627,7 @@ SHOW_ERR1(_("Project base directory could not be created (%s)."), g_strerror(err_code)); gtk_widget_grab_focus(e->base_path); - utils_free_pointers(locale_path, locale_filename, NULL); + utils_free_pointers(2, locale_path, locale_filename, NULL); return FALSE; } } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/search.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -1321,7 +1321,7 @@ tool_prefs.grep_cmd, opts, utf8_search_text, dir); utf8_str = utils_get_utf8_from_locale(str); msgwin_msg_add(COLOR_BLUE, -1, NULL, utf8_str); - utils_free_pointers(str, utf8_str, NULL); + utils_free_pointers(2, str, utf8_str, NULL); ret = TRUE; } g_strfreev(argv); Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/templates.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -390,7 +390,7 @@ utils_string_replace_all(&template, "{filename}", doc_filename); utils_string_replace_all(&template, "{fileheader}", file_header); - utils_free_pointers(year, date, datetime, file_header, NULL); + utils_free_pointers(4, year, date, datetime, file_header, NULL); } return template.str; } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/utils.c 2008-11-18 17:14:00 UTC (rev 3245) @@ -505,10 +505,10 @@ gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement) { GString *str; - + if (haystack == NULL) return NULL; - + str = g_string_new(haystack); g_free(haystack); @@ -1101,24 +1101,24 @@ } -/* Frees all passed pointers if they are *ALL* non-NULL. - * Do not use if any pointers may be NULL. - * The first argument is nothing special, it will also be freed. - * The list must be ended with NULL. */ -void utils_free_pointers(gpointer first, ...) +/* Pass pointers to free after arg_count. + * The last argument must be NULL as an extra check that arg_count is correct. */ +void utils_free_pointers(gsize arg_count, ...) { va_list a; - gpointer sa; + gsize i; + gpointer ptr; - for (va_start(a, first); (sa = va_arg(a, gpointer), sa!=NULL);) - { - if (sa != NULL) - g_free(sa); + va_start(a, arg_count); + for (i = 0; i < arg_count; i++) + { + ptr = va_arg(a, gpointer); + g_free(ptr); } + ptr = va_arg(a, gpointer); + if (ptr) + g_warning("Wrong arg_count!"); va_end(a); - - if (first != NULL) - g_free(first); } Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-11-18 17:03:15 UTC (rev 3244) +++ trunk/src/utils.h 2008-11-18 17:14:00 UTC (rev 3245) @@ -118,7 +118,7 @@ gchar *utils_get_utf8_from_locale(const gchar *locale_text); -void utils_free_pointers(gpointer first, ...) G_GNUC_NULL_TERMINATED; +void utils_free_pointers(gsize arg_count, ...) G_GNUC_NULL_TERMINATED; gchar **utils_strv_new(const gchar *first, ...) G_GNUC_NULL_TERMINATED; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3244] trunk
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3244 http://geany.svn.sourceforge.net/geany/?rev=3244&view=rev Author: eht16 Date: 2008-11-18 17:03:15 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Remove forced size requests for the tab close icon as it seems not necessary and broke the icon on Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 13:29:53 UTC (rev 3243) +++ trunk/ChangeLog 2008-11-18 17:03:15 UTC (rev 3244) @@ -1,3 +1,10 @@ +2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/notebook.c: + Remove forced size requests for the tab close icon as it seems not + necessary and broke the icon on Windows. + + 2008-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/treeviews.c: Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-11-18 13:29:53 UTC (rev 3243) +++ trunk/src/notebook.c 2008-11-18 17:03:15 UTC (rev 3244) @@ -479,9 +479,7 @@ gtk_rc_style_unref(rcstyle); image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); - gtk_widget_size_request(image, &size); - gtk_widget_set_size_request(btn, size.width, size.height); - gtk_container_add(GTK_CONTAINER(btn), image); + gtk_button_set_image(GTK_BUTTON(btn), image); align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); gtk_container_add(GTK_CONTAINER(align), btn); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3243] trunk
by ntrel＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3243 http://geany.svn.sourceforge.net/geany/?rev=3243&view=rev Author: ntrel Date: 2008-11-18 13:29:53 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Move symbol list popup menu code to symbols.c. Add symbols_init(). Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/symbols.c trunk/src/symbols.h trunk/src/treeviews.c trunk/src/treeviews.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/ChangeLog 2008-11-18 13:29:53 UTC (rev 3243) @@ -2,6 +2,10 @@ * src/treeviews.c: Refactor with sidebar_add_common_menu_items(). + * src/treeviews.c, src/treeviews.h, src/main.c, src/symbols.c, + src/symbols.h: + Move symbol list popup menu code to symbols.c. + Add symbols_init(). 2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/src/main.c 2008-11-18 13:29:53 UTC (rev 3243) @@ -944,6 +944,7 @@ navqueue_init(); document_init_doclist(); treeviews_init(); + symbols_init(); configuration_read_filetype_extensions(); editor_snippets_init(); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/src/symbols.c 2008-11-18 13:29:53 UTC (rev 3243) @@ -365,13 +365,6 @@ } -void symbols_finalize(void) -{ - g_strfreev(html_entities); - g_strfreev(c_tags_ignore); -} - - /* sort by name, then line */ static gint compare_symbol(const TMTag *tag_a, const TMTag *tag_b) { @@ -1669,3 +1662,48 @@ } +static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data) +{ + gint sort_mode = GPOINTER_TO_INT(user_data); + GeanyDocument *doc = document_get_current(); + + if (doc != NULL) + doc->has_tags = symbols_recreate_tag_list(doc, sort_mode); +} + + +static void create_taglist_popup_menu(void) +{ + GtkWidget *item; + + tv.popup_taglist = gtk_menu_new(); + + item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); + g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), + GINT_TO_POINTER(SYMBOLS_SORT_BY_NAME)); + + item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); + g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), + GINT_TO_POINTER(SYMBOLS_SORT_BY_APPEARANCE)); + + sidebar_add_common_menu_items(GTK_MENU(tv.popup_taglist)); +} + + +void symbols_init(void) +{ + create_taglist_popup_menu(); +} + + +void symbols_finalize(void) +{ + g_strfreev(html_entities); + g_strfreev(c_tags_ignore); +} + + Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/src/symbols.h 2008-11-18 13:29:53 UTC (rev 3243) @@ -35,6 +35,10 @@ }; +void symbols_init(void); + +void symbols_finalize(void); + void symbols_global_tags_loaded(gint file_type_idx); GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang); @@ -47,8 +51,6 @@ const gchar **symbols_get_html_entities(void); -void symbols_finalize(void); - gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode); gint symbols_generate_global_tags(gint argc, gchar **argv, gboolean want_preprocess); Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/src/treeviews.c 2008-11-18 13:29:53 UTC (rev 3243) @@ -54,12 +54,7 @@ { OPENFILES_ACTION_REMOVE = 0, OPENFILES_ACTION_SAVE, - OPENFILES_ACTION_RELOAD, - OPENFILES_ACTION_HIDE, - OPENFILES_ACTION_HIDE_ALL, - SYMBOL_ACTION_SORT_BY_NAME, - SYMBOL_ACTION_SORT_BY_APPEARANCE, - SYMBOL_ACTION_HIDE + OPENFILES_ACTION_RELOAD }; typedef struct @@ -73,7 +68,6 @@ static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ -static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data); static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data); static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); @@ -382,7 +376,7 @@ } -static void sidebar_add_common_menu_items(GtkMenu *menu) +void sidebar_add_common_menu_items(GtkMenu *menu) { GtkWidget *item; @@ -415,28 +409,6 @@ } -static void create_taglist_popup_menu(void) -{ - GtkWidget *item; - - tv.popup_taglist = gtk_menu_new(); - - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), - GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_NAME)); - - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), - GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_APPEARANCE)); - - sidebar_add_common_menu_items(GTK_MENU(tv.popup_taglist)); -} - - static void on_openfiles_fullpath_activate(GtkCheckMenuItem *item, gpointer user_data) { interface_prefs.sidebar_openfiles_fullpath = gtk_check_menu_item_get_active(item); @@ -599,34 +571,6 @@ } -static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data) -{ - switch (GPOINTER_TO_INT(user_data)) - { - case SYMBOL_ACTION_SORT_BY_NAME: - { - GeanyDocument *doc = document_get_current(); - if (doc != NULL) - doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_BY_NAME); - break; - } - case SYMBOL_ACTION_SORT_BY_APPEARANCE: - { - GeanyDocument *doc = document_get_current(); - if (doc != NULL) - doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_BY_APPEARANCE); - break; - } - case SYMBOL_ACTION_HIDE: - { - interface_prefs.sidebar_symbol_visible = FALSE; - ui_sidebar_show_hide(); - break; - } - } -} - - static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection) { GtkTreeIter iter; @@ -704,7 +648,7 @@ g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, select); } else if (event->button == 3) - { /* popupmenu to hide or clear the active treeview */ + { /* update & show popup menus */ if (GPOINTER_TO_INT(user_data) == TREEVIEW_OPENFILES) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.documents_fullpath), @@ -729,7 +673,6 @@ tag_window = lookup_widget(main_widgets.window, "scrolledwindow2"); prepare_openfiles(); - create_taglist_popup_menu(); create_openfiles_popup_menu(); } Modified: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2008-11-18 12:58:53 UTC (rev 3242) +++ trunk/src/treeviews.h 2008-11-18 13:29:53 UTC (rev 3243) @@ -59,4 +59,6 @@ void treeviews_remove_document(GeanyDocument *doc); +void sidebar_add_common_menu_items(GtkMenu *menu); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3242] trunk
by ntrel＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3242 http://geany.svn.sourceforge.net/geany/?rev=3242&view=rev Author: ntrel Date: 2008-11-18 12:58:53 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Refactor with sidebar_add_common_menu_items(). Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-16 17:55:23 UTC (rev 3241) +++ trunk/ChangeLog 2008-11-18 12:58:53 UTC (rev 3242) @@ -1,3 +1,9 @@ +2008-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/treeviews.c: + Refactor with sidebar_add_common_menu_items(). + + 2008-11-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Makefile.am: Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-11-16 17:55:23 UTC (rev 3241) +++ trunk/src/treeviews.c 2008-11-18 12:58:53 UTC (rev 3242) @@ -59,18 +59,14 @@ OPENFILES_ACTION_HIDE_ALL, SYMBOL_ACTION_SORT_BY_NAME, SYMBOL_ACTION_SORT_BY_APPEARANCE, - SYMBOL_ACTION_HIDE, - SYMBOL_ACTION_HIDE_ALL + SYMBOL_ACTION_HIDE }; typedef struct { GtkWidget *documents_fullpath; - GtkWidget *documents_show_symbols; - GtkWidget *documents_show_documents; - GtkWidget *symbols_show_symbols; - GtkWidget *symbols_show_documents; } menu_items; + static menu_items mi; static GtkListStore *store_openfiles; @@ -80,7 +76,6 @@ static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data); static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data); static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); -static void on_openfiles_hide_item_clicked(GtkMenuItem *menuitem, gpointer user_data); static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); static gboolean on_treeviews_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data); @@ -364,47 +359,81 @@ } -static void create_taglist_popup_menu(void) +static void on_hide_sidebar(void) { - GtkWidget *item; + ui_prefs.sidebar_visible = FALSE; + ui_sidebar_show_hide(); +} - tv.popup_taglist = gtk_menu_new(); - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), - GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_NAME)); +static gboolean on_sidebar_display_symbol_list_show(GtkWidget *item) +{ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + interface_prefs.sidebar_symbol_visible); + return FALSE; +} - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), - GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_APPEARANCE)); +static gboolean on_sidebar_display_open_files_show(GtkWidget *item) +{ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + interface_prefs.sidebar_openfiles_visible); + return FALSE; +} + + +static void sidebar_add_common_menu_items(GtkMenu *menu) +{ + GtkWidget *item; + item = gtk_separator_menu_item_new(); gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); + gtk_container_add(GTK_CONTAINER(menu), item); - mi.symbols_show_symbols = gtk_check_menu_item_new_with_mnemonic(_("Show S_ymbol List")); - gtk_widget_show(mi.symbols_show_symbols); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), mi.symbols_show_symbols); - g_signal_connect(mi.symbols_show_symbols, "activate", + item = gtk_check_menu_item_new_with_mnemonic(_("Show S_ymbol List")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "expose-event", + G_CALLBACK(on_sidebar_display_symbol_list_show), NULL); + gtk_widget_show(item); + g_signal_connect(item, "activate", G_CALLBACK(on_list_symbol_activate), NULL); - mi.symbols_show_documents = gtk_check_menu_item_new_with_mnemonic(_("Show _Document List")); - gtk_widget_show(mi.symbols_show_documents); - gtk_container_add(GTK_CONTAINER(tv.popup_taglist), mi.symbols_show_documents); - g_signal_connect(mi.symbols_show_documents, "activate", + item = gtk_check_menu_item_new_with_mnemonic(_("Show _Document List")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "expose-event", + G_CALLBACK(on_sidebar_display_open_files_show), NULL); + gtk_widget_show(item); + g_signal_connect(item, "activate", G_CALLBACK(on_list_document_activate), NULL); item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); +} + + +static void create_taglist_popup_menu(void) +{ + GtkWidget *item; + + tv.popup_taglist = gtk_menu_new(); + + item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name")); + gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), - GINT_TO_POINTER(SYMBOL_ACTION_HIDE_ALL)); + GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_NAME)); + + item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); + g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), + GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_APPEARANCE)); + + sidebar_add_common_menu_items(GTK_MENU(tv.popup_taglist)); } @@ -469,28 +498,7 @@ g_signal_connect(mi.documents_fullpath, "activate", G_CALLBACK(on_openfiles_fullpath_activate), NULL); - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); - - mi.documents_show_symbols = gtk_check_menu_item_new_with_mnemonic(_("Show S_ymbol List")); - gtk_widget_show(mi.documents_show_symbols); - gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), mi.documents_show_symbols); - g_signal_connect(mi.documents_show_symbols, "activate", - G_CALLBACK(on_list_symbol_activate), NULL); - - mi.documents_show_documents = gtk_check_menu_item_new_with_mnemonic(_("Show _Document List")); - gtk_widget_show(mi.documents_show_documents); - gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), mi.documents_show_documents); - g_signal_connect(mi.documents_show_documents, "activate", - G_CALLBACK(on_list_document_activate), NULL); - - item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); - g_signal_connect(item, "activate", G_CALLBACK(on_openfiles_hide_item_clicked), NULL); + sidebar_add_common_menu_items(GTK_MENU(tv.popup_openfiles)); } @@ -556,13 +564,6 @@ } -static void on_openfiles_hide_item_clicked(GtkMenuItem *menuitem, gpointer user_data) -{ - ui_prefs.sidebar_visible = FALSE; - ui_sidebar_show_hide(); -} - - static gboolean change_focus(gpointer data) { GeanyDocument *doc = data; @@ -622,12 +623,6 @@ ui_sidebar_show_hide(); break; } - case SYMBOL_ACTION_HIDE_ALL: - { - ui_prefs.sidebar_visible = FALSE; - ui_sidebar_show_hide(); - break; - } } } @@ -712,10 +707,6 @@ { /* popupmenu to hide or clear the active treeview */ if (GPOINTER_TO_INT(user_data) == TREEVIEW_OPENFILES) { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.documents_show_documents), - interface_prefs.sidebar_openfiles_visible); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.documents_show_symbols), - interface_prefs.sidebar_symbol_visible); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.documents_fullpath), interface_prefs.sidebar_openfiles_fullpath); gtk_menu_popup(GTK_MENU(tv.popup_openfiles), NULL, NULL, NULL, NULL, @@ -723,10 +714,6 @@ } else if (GPOINTER_TO_INT(user_data) == TREEVIEW_SYMBOL) { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.symbols_show_documents), - interface_prefs.sidebar_openfiles_visible); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi.symbols_show_symbols), - interface_prefs.sidebar_symbol_visible); gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, event->button, event->time); return TRUE; /* prevent selection changed signal for symbol tags */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3241] trunk
by eht16＠users.sourceforge.net 16 Nov '08

16 Nov '08

Revision: 3241 http://geany.svn.sourceforge.net/geany/?rev=3241&view=rev Author: eht16 Date: 2008-11-16 17:55:23 +0000 (Sun, 16 Nov 2008) Log Message: ----------- When passing NULL to utils_str_replace(), also return NULL (fixes broken new file template list). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-16 17:55:05 UTC (rev 3240) +++ trunk/ChangeLog 2008-11-16 17:55:23 UTC (rev 3241) @@ -20,6 +20,9 @@ to indicators for more consistency. * src/templates.c: Plug little memory leak. + * src/utils.c: + When passing NULL to utils_str_replace(), also return NULL + (fixes broken new file template list). 2008-11-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-11-16 17:55:05 UTC (rev 3240) +++ trunk/src/utils.c 2008-11-16 17:55:23 UTC (rev 3241) @@ -504,7 +504,12 @@ * See utils_string_replace_all() for details. */ gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement) { - GString *str = g_string_new(haystack); + GString *str; + + if (haystack == NULL) + return NULL; + + str = g_string_new(haystack); g_free(haystack); utils_string_replace_all(str, needle, replacement); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3240] trunk
by eht16＠users.sourceforge.net 16 Nov '08

16 Nov '08

Revision: 3240 http://geany.svn.sourceforge.net/geany/?rev=3240&view=rev Author: eht16 Date: 2008-11-16 17:55:05 +0000 (Sun, 16 Nov 2008) Log Message: ----------- Plug little memory leak. Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-16 17:54:46 UTC (rev 3239) +++ trunk/ChangeLog 2008-11-16 17:55:05 UTC (rev 3240) @@ -18,6 +18,8 @@ Note: this breaks the plugin API for Editor and Scintilla functions. Rename all functions in editor.c and sciwrappers.c which are related to indicators for more consistency. + * src/templates.c: + Plug little memory leak. 2008-11-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-11-16 17:54:46 UTC (rev 3239) +++ trunk/src/templates.c 2008-11-16 17:55:05 UTC (rev 3240) @@ -512,6 +512,7 @@ init_ft_templates(year, date, datetime); g_free(date); + g_free(datetime); g_free(year); create_file_template_menus(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3239] trunk
by eht16＠users.sourceforge.net 16 Nov '08

16 Nov '08

Revision: 3239 http://geany.svn.sourceforge.net/geany/?rev=3239&view=rev Author: eht16 Date: 2008-11-16 17:54:46 +0000 (Sun, 16 Nov 2008) Log Message: ----------- Improve layout of the combo box labels in the Find in Files dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-16 17:54:28 UTC (rev 3238) +++ trunk/ChangeLog 2008-11-16 17:54:46 UTC (rev 3239) @@ -7,6 +7,7 @@ when a Find in Files search fails. Add the project's base_path to the directory list in the Find in Files dialog if a project is open. + Improve layout of the combo box labels in the Find in Files dialog. * src/search.c, src/ui_utils.c, src/ui_utils.h: Add and use ui_combo_box_prepend_text_once() to add project's base_path to the Find in Files dialog even if another project was Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-16 17:54:28 UTC (rev 3238) +++ trunk/src/search.c 2008-11-16 17:54:46 UTC (rev 3239) @@ -565,7 +565,7 @@ static void create_fif_dialog() { GtkWidget *dir_combo, *combo, *e_combo, *entry; - GtkWidget *label, *label1, *checkbox1, *checkbox2, *check_wholeword, + GtkWidget *label, *label1, *label2, *checkbox1, *checkbox2, *check_wholeword, *check_recursive, *check_extra, *entry_extra; GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox, *ebox; GtkSizeGroup *size_group; @@ -587,7 +587,7 @@ GTK_RESPONSE_ACCEPT); label1 = gtk_label_new_with_mnemonic(_("_Directory:")); - gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label1), 1, 0.5); dir_combo = gtk_combo_box_entry_new_text(); entry = gtk_bin_get_child(GTK_BIN(dir_combo)); @@ -601,7 +601,7 @@ gtk_box_pack_start(GTK_BOX(dbox), label1, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Search for:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); combo = gtk_combo_box_entry_new_text(); entry = gtk_bin_get_child(GTK_BIN(combo)); @@ -615,8 +615,8 @@ gtk_box_pack_start(GTK_BOX(sbox), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(sbox), combo, TRUE, TRUE, 0); - label = gtk_label_new_with_mnemonic(_("E_ncoding:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + label2 = gtk_label_new_with_mnemonic(_("E_ncoding:")); + gtk_misc_set_alignment(GTK_MISC(label2), 1, 0.5); e_combo = gtk_combo_box_new_text(); for (i = 0; i < GEANY_ENCODINGS_MAX; i++) @@ -626,16 +626,17 @@ g_free(encoding_string); } gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(e_combo), 3); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), e_combo); + gtk_label_set_mnemonic_widget(GTK_LABEL(label2), e_combo); find_in_files.encoding_combo = e_combo; ebox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(ebox), label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(ebox), label2, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(ebox), e_combo, TRUE, TRUE, 0); size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); gtk_size_group_add_widget(size_group, label1); gtk_size_group_add_widget(size_group, label); + gtk_size_group_add_widget(size_group, label2); g_object_unref(G_OBJECT(size_group)); /* auto destroy the size group */ rbox = gtk_vbox_new(FALSE, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2008